Merge branch 'master' of github.com:elastic/kibana into implement/supportPluginsAnywhere

.eslintrc

@@ -1,76 +1,2 @@
 ---
-parser: babel-eslint
-
-plugins:
-  - mocha
-
-env:
-  es6: true
-  amd: true
-  node: true
-  mocha: true
-  browser: true
-
-
-rules:
-  block-scoped-var: 2
-  camelcase: [ 2, { properties: never } ]
-  comma-dangle: 0
-  comma-style: [ 2, last ]
-  consistent-return: 0
-  curly: [ 2, multi-line ]
-  dot-location: [ 2, property ]
-  dot-notation: [ 2, { allowKeywords: true } ]
-  eqeqeq: [ 2, allow-null ]
-  guard-for-in: 2
-  indent: [ 2, 2, { SwitchCase: 1 } ]
-  key-spacing: [ 0, { align: value } ]
-  max-len: [ 2, 140, 2, { ignoreComments: true, ignoreUrls: true } ]
-  new-cap: [ 2, { capIsNewExceptions: [ Private ] } ]
-  no-bitwise: 0
-  no-caller: 2
-  no-cond-assign: 0
-  no-const-assign: 2
-  no-debugger: 2
-  no-empty: 2
-  no-eval: 2
-  no-extend-native: 2
-  no-extra-parens: 0
-  no-irregular-whitespace: 2
-  no-iterator: 2
-  no-loop-func: 2
-  no-multi-spaces: 0
-  no-multi-str: 2
-  no-nested-ternary: 2
-  no-new: 0
-  no-path-concat: 0
-  no-proto: 2
-  no-return-assign: 0
-  no-script-url: 2
-  no-sequences: 2
-  no-shadow: 0
-  no-trailing-spaces: 2
-  no-undef: 2
-  no-underscore-dangle: 0
-  no-unused-expressions: 0
-  no-unused-vars: 0
-  no-use-before-define: [ 2, nofunc ]
-  no-with: 2
-  one-var: [ 2, never ]
-  quotes: [ 2, single ]
-  semi-spacing: [ 2, { before: false, after: true } ]
-  semi: [ 2, always ]
-  space-after-keywords: [ 2, always ]
-  space-before-blocks: [ 2, always ]
-  space-before-function-paren: [ 2, { anonymous: always, named: never } ]
-  space-in-parens: [ 2, never ]
-  space-infix-ops: [ 2, { int32Hint: false } ]
-  space-return-throw-case: [ 2 ]
-  space-unary-ops: [ 2 ]
-  strict: [ 2, never ]
-  valid-typeof: 2
-  wrap-iife: [ 2, outside ]
-  yoda: 0
-
-  mocha/no-exclusive-tests: 2
-  mocha/handle-done-callback: 2
+extends: '@elastic/kibana'

.node-version

@@ -1 +1 @@
-4.2.4
+4.3.0

package.json

@@ -139,13 +139,14 @@
     "wreck": "6.2.0"
   },
   "devDependencies": {
+    "@elastic/eslint-config-kibana": "0.0.2",
     "Nonsense": "0.1.2",
     "angular-mocks": "1.4.7",
     "auto-release-sinon": "1.0.3",
-    "babel-eslint": "4.1.7",
+    "babel-eslint": "4.1.8",
     "chokidar": "1.0.5",
-    "eslint": "1.5.1",
-    "eslint-plugin-mocha": "1.0.0",
+    "eslint": "1.10.3",
+    "eslint-plugin-mocha": "1.1.0",
     "expect.js": "0.3.1",
     "faker": "1.1.0",
     "glob": "4.5.3",
@@ -186,7 +187,7 @@
     "supertest-as-promised": "2.0.2"
   },
   "engines": {
-    "node": "4.2.4",
+    "node": "4.3.0",
     "npm": "2.14.15"
   }
 }

src/ui/public/chrome/directives/active_http_spinner.html

@@ -0,0 +1,5 @@
+<ul class="nav navbar-nav navbar-right navbar-timepicker" >
+  <li ng-show="chrome.httpActive.length" class="navbar-text hidden-xs">
+    <div class="spinner"></div>
+  </li>
+</ul>

src/ui/public/chrome/directives/append_nav_controls.js

@@ -2,6 +2,12 @@ import $ from 'jquery';
 
 import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
 import UiModules from 'ui/modules';
+import spinnerHtml from './active_http_spinner.html';
+
+const spinner = {
+  name: 'active http requests',
+  template: spinnerHtml
+};
 
 export default function (chrome, internals) {
 
@@ -13,7 +19,7 @@ export default function (chrome, internals) {
         const parts = [$element.html()];
         const controls = Private(chromeNavControlsRegistry);
 
-        for (const control of controls.inOrder) {
+        for (const control of [spinner, ...controls.inOrder]) {
           parts.unshift(
             `<!-- nav control ${control.name} -->`,
             control.template

src/ui/public/chrome/directives/kbn_chrome.js

@@ -44,7 +44,7 @@ export default function (chrome, internals) {
         onRouteChange();
 
         // and some local values
-        $scope.httpActive = $http.pendingRequests;
+        chrome.httpActive = $http.pendingRequests;
         $scope.notifList = require('ui/notify')._notifs;
         $scope.appSwitcherTemplate = new ConfigTemplate({
           switcher: '<app-switcher></app-switcher>'

src/ui/public/paginated_table/paginated_table.js

@@ -57,7 +57,8 @@ uiModules
           // use generic sort handler
           self.sort.getter = function (row) {
             var value = row[index];
-            if (value && value.value != null) return value.value;
+            if (value && value.value != null) value = value.value;
+            if (typeof value === 'boolean') value = value ? 0 : 1;
             return value;
           };
         }