allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [17/24] allura git commit: [#8035] ESLINT FIX: indent, block-scoped-var
Date Tue, 26 Jan 2016 19:11:48 GMT
[#8035] ESLINT FIX: indent, block-scoped-var


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/34a75800
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/34a75800
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/34a75800

Branch: refs/heads/hs/8035
Commit: 34a758008ea783ede72286944931b06dfa1dc02f
Parents: abb5144
Author: Heith Seewald <heiths@gmail.com>
Authored: Thu Jan 21 19:44:56 2016 -0500
Committer: Heith Seewald <heiths@gmail.com>
Committed: Tue Jan 26 14:11:05 2016 -0500

----------------------------------------------------------------------
 .eslintrc                                | 3 ++-
 Allura/allura/public/nf/js/navbar.es6.js | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/34a75800/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index e58bfe1..455b95a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -11,7 +11,8 @@
         "ClassDeclaration": false
       }
     }],
-    "no-inline-comments": 0
+    "no-inline-comments": 0,
+    "comma-dangle": 0
   },
   "globals": {
     "ReactDOM": true,

http://git-wip-us.apache.org/repos/asf/allura/blob/34a75800/Allura/allura/public/nf/js/navbar.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/navbar.es6.js b/Allura/allura/public/nf/js/navbar.es6.js
index 23f9313..52493bc 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -171,7 +171,7 @@ var NormalNavItem = React.createClass({
         url: React.PropTypes.string.isRequired,
         classes: React.PropTypes.string
     },
-  mixins: [React.addons.PureRenderMixin],
+    mixins: [React.addons.PureRenderMixin],
     render: function() {
         return (
             <li key={`tb-norm-${_.uniqueId()}`}>
@@ -291,7 +291,7 @@ var AdminNav = React.createClass({
         var [tools, anchoredTools, endTools] = [[], [], []];
         var subMenu;
         var childOptionsOpen;
-
+        var _handle;
         for (let item of items) {
             if (item.children) {
                 subMenu = this.buildMenu(item.children, true);
@@ -299,7 +299,7 @@ var AdminNav = React.createClass({
                 subMenu = null;
             }
 
-            var _handle = isSubMenu ? "draggable-handle-sub" : 'draggable-handle';
+            _handle = isSubMenu ? "draggable-handle-sub" : 'draggable-handle';
             var toolList;
             var isAnchored;
             if (item.mount_point === 'admin') {


Mime
View raw message