allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [09/24] allura git commit: [#8035] ESLINT FIX: operator-linebreak
Date Tue, 26 Jan 2016 19:11:40 GMT
[#8035] ESLINT FIX: operator-linebreak


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

Branch: refs/heads/hs/8035
Commit: f17729fe54cb84bc316e11027d841cc8639fb0ac
Parents: b0d8797
Author: Heith Seewald <heiths@gmail.com>
Authored: Thu Jan 21 18:33:22 2016 -0500
Committer: Heith Seewald <heiths@gmail.com>
Committed: Tue Jan 26 14:11:03 2016 -0500

----------------------------------------------------------------------
 .eslintrc                                |  3 ++-
 Allura/allura/public/nf/js/navbar.es6.js | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/f17729fe/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index b42eb66..ff25e9d 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,8 @@
     "max-len": [1, 119, 4],
     "indent": [2, 4],
     "jsx-quotes": [0],
-    "quotes": [0]
+    "quotes": [0],
+    "operator-linebreak": [2, "before", { "overrides": { "?": "after", "&&": "after"
} }]
   },
   "globals": {
     "ReactDOM": true,

http://git-wip-us.apache.org/repos/asf/allura/blob/f17729fe/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 1055d43..818bb3e 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -98,13 +98,13 @@ var NavBarItem = React.createClass({
                         {this.props.name}
                     </span>
                 </a>
-                {this.props.currentOptionMenu.tool
-                && this.props.currentOptionMenu.tool === this.props.mount_point
-                && <ContextMenu
+                {this.props.currentOptionMenu.tool &&
+                this.props.currentOptionMenu.tool === this.props.mount_point &&
+                <ContextMenu
                     {...this.props}
-                        items={this.props.options}
-                        onOptionClick={this.props.onOptionClick}
-                    /> }
+                    items={this.props.options}
+                    onOptionClick={this.props.onOptionClick}
+                /> }
             </div>
         );
     },


Mime
View raw message