summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorClaudson Martins <claudson@outlook.com>2015-10-20 10:01:30 -0300
committerClaudson Martins <claudson@outlook.com>2015-10-20 10:01:30 -0300
commite07de9cf8910b0b9c4a40290b92fb16fa3bf7289 (patch)
tree42081148c00996b045072e83c900a623f20a1664
parent9702bcaf86c7a0fa004c120443cb43a6ec2d6e04 (diff)
parentb354013dc9bcba5e76bd3cf720eae8af7d9eba89 (diff)
Merge remote-tracking branch 'refs/remotes/adambard/master'
-rw-r--r--de-de/go-de.html.markdown3
-rw-r--r--javascript.html.markdown13
2 files changed, 10 insertions, 6 deletions
diff --git a/de-de/go-de.html.markdown b/de-de/go-de.html.markdown
index 765372e0..7e61bf81 100644
--- a/de-de/go-de.html.markdown
+++ b/de-de/go-de.html.markdown
@@ -3,6 +3,7 @@ language: Go
filename: learngo-de.go
contributors:
- ["Joseph Adams", "https://github.com/jcla1"]
+ - ["Dennis Keller", "https://github.com/denniskeller"]
lang: de-de
---
Go wurde entwickelt, um Probleme zu lösen. Sie ist zwar nicht der neueste Trend in
@@ -306,7 +307,7 @@ func (p pair) ServeHTTP(w http.ResponseWriter, r *http.Request) {
## Weitere Resourcen
Alles zu Go finden Sie auf der [offiziellen Go Webseite](http://golang.org/).
-Dort können sie der Tutorial folgen, interaktiv Quelltext ausprobieren und viel
+Dort können sie dem Tutorial folgen, interaktiv Quelltext ausprobieren und viel
Dokumentation lesen.
Auch zu empfehlen ist die Spezifikation von Go, die nach heutigen Standards sehr
diff --git a/javascript.html.markdown b/javascript.html.markdown
index d408e885..a119be88 100644
--- a/javascript.html.markdown
+++ b/javascript.html.markdown
@@ -291,12 +291,9 @@ myFunction("foo"); // = "FOO"
// Note that the value to be returned must start on the same line as the
// `return` keyword, otherwise you'll always return `undefined` due to
// automatic semicolon insertion. Watch out for this when using Allman style.
-function myFunction()
-{
+function myFunction(){
return // <- semicolon automatically inserted here
- {
- thisIsAn: 'object literal'
- }
+ {thisIsAn: 'object literal'}
}
myFunction(); // = undefined
@@ -310,6 +307,12 @@ setTimeout(myFunction, 5000);
// Note: setTimeout isn't part of the JS language, but is provided by browsers
// and Node.js.
+// Another function provided by browsers is setInterval
+function myFunction(){
+ // this code will be called every 5 seconds
+}
+setInterval(myFunction, 5000);
+
// Function objects don't even have to be declared with a name - you can write
// an anonymous function definition directly into the arguments of another.
setTimeout(function(){