From 10becbaab08ae1d2743eb065d4b1ef5dcbd9d64d Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Tue, 15 Mar 2016 12:22:53 +0200
Subject: [PATCH 1/2] (Coding Convention) Use stacked `else/catch` clauses.

---
 CodingConvention.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CodingConvention.md b/CodingConvention.md
index 0a13d2935..e8ad064b7 100644
--- a/CodingConvention.md
+++ b/CodingConvention.md
@@ -87,6 +87,29 @@ if (true)
 
 Also, notice the use of whitespace before and after the condition statement.
 
+Follow the JavaScript convention of stacking `else/catch` clauses on the same line as the previous closing brace.
+
+*Right:*
+
+~~~ {.javascript}
+if (i % 2 === 0) {
+    console.log('even');
+} else {
+    console.log('odd');
+}
+~~~
+
+*Wrong:*
+
+~~~ {.javascript}
+if (i % 2 === 0) {
+    console.log('even');
+}
+else {
+    console.log('odd');
+}
+~~~
+
 ## Variable declarations
 
 Declare one variable per var statement. Try to put those declarations at the beginning of each scope.

From 72adc9ff7a68fcd2931c6500ccefcb94468ab09c Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Tue, 15 Mar 2016 12:23:32 +0200
Subject: [PATCH 2/2] (Coding Convention) Fix indents to use 4 spaces (per the
 same guideline).

---
 CodingConvention.md | 62 ++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/CodingConvention.md b/CodingConvention.md
index e8ad064b7..0427e6643 100644
--- a/CodingConvention.md
+++ b/CodingConvention.md
@@ -72,7 +72,7 @@ Your opening braces go on the same line as the statement.
 
 ~~~ {.javascript}
 if (true) {
-  console.log('winning');
+    console.log('winning');
 }
 ~~~
 
@@ -81,7 +81,7 @@ if (true) {
 ~~~ {.javascript}
 if (true)
 {
-  console.log('losing');
+    console.log('losing');
 }
 ~~~
 
@@ -267,7 +267,7 @@ Use the [strict comaprison operators][comparisonoperators]. The triple equality
 ~~~ {.javascript}
 var a = 0;
 if (a === '') {
-  console.log('winning');
+    console.log('winning');
 }
 
 ~~~
@@ -277,7 +277,7 @@ if (a === '') {
 ~~~ {.javascript}
 var a = 0;
 if (a == '') {
-  console.log('losing');
+    console.log('losing');
 }
 ~~~
 
@@ -309,7 +309,7 @@ Always use curly braces even in the cases of one line conditional operations.
 
 ~~~ {.javascript}
 if (a) {
-  return 'winning';
+    return 'winning';
 }
 
 ~~~
@@ -318,8 +318,8 @@ if (a) {
 
 ~~~ {.javascript}
 
-if (a) 
-  return 'winning';
+if (a)
+    return 'winning';
 
 if (a) return 'winning';
 ~~~
@@ -332,11 +332,11 @@ if (a) return 'winning';
 ~~~ {.javascript}
 
 if(condition) {
-  console.log('winning');
+    console.log('winning');
 }
 
 if (!condition) {
-  console.log('winning');
+    console.log('winning');
 }
 
 ~~~
@@ -346,15 +346,15 @@ if (!condition) {
 ~~~ {.javascript}
 
 if(condition === true) {
-  console.log('losing');
+    console.log('losing');
 }
 
 if(condition !== true) {
-  console.log('losing');
+    console.log('losing');
 }
 
 if(condition !== false) {
-  console.log('losing');
+    console.log('losing');
 }
 
 ~~~
@@ -372,7 +372,7 @@ Do not use the **Yoda Conditions** when writing boolean expressions:
 ~~~ {.javascript}
 var num;
 if(num >= 0) {
-  console.log('winning');
+    console.log('winning');
 }
 ~~~
 
@@ -381,14 +381,14 @@ if(num >= 0) {
 ~~~ {.javascript}
 var num;
 if(0 <= num) {
-  console.log('losing');
+    console.log('losing');
 }
 ~~~
 
 **NOTE** It is OK to use constants on the left when comparing for a range.
 ~~~ {.javascript}
 if(0 <= num && num <= 100) {
-  console.log('winning');
+    console.log('winning');
 }
 ~~~
 
@@ -408,22 +408,22 @@ as possible. In certain routines, once you know the answer, you want to return i
 
 ~~~ {.javascript}
 function getSomething(val) {
-  if (val < 0) {
-    return false;
-  }
-  
-  if (val > 100) {
-    return false;
-  }
-  
-  var res1 = doOne();
-  var res2 = doTwo();
-  var options = {
-    a: 1,
-    b: 2
-  };
-  var result = doThree(res1, res2, options);
-  return result;
+    if (val < 0) {
+        return false;
+    }
+
+    if (val > 100) {
+        return false;
+    }
+
+    var res1 = doOne();
+    var res2 = doTwo();
+    var options = {
+        a: 1,
+        b: 2
+    };
+    var result = doThree(res1, res2, options);
+    return result;
 }
 ~~~