diff --git a/.jshintrc b/.jshintrc index 54051651ff6..4fb06a6f6ec 100644 --- a/.jshintrc +++ b/.jshintrc @@ -29,6 +29,7 @@ "globals": { "define": true, "require": true, - "Chromath": false + "Chromath": false, + "setImmediate": true } } \ No newline at end of file diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index f11d3974cf2..cb976931982 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -5,5 +5,6 @@ define([ './pulldown', './zoom', './search', - './metricKeys' + './metricKeys', + './graphiteTarget' ], function () {}); \ No newline at end of file diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js new file mode 100644 index 00000000000..f528d6f9863 --- /dev/null +++ b/src/app/controllers/graphiteTarget.js @@ -0,0 +1,25 @@ +define([ + 'angular', +], +function (angular) { + 'use strict'; + + var module = angular.module('kibana.controllers'); + + module.controller('GraphiteTargetCtrl', function($scope) { + + $scope.init = function() { + console.log('target:', $scope.target); + }; + + $scope.targetChanged = function() { + $scope.$parent.get_data(); + $scope.editMode = false; + }; + + $scope.edit = function() { + $scope.editMode = true; + }; + }); + +}); \ No newline at end of file diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js index b255a617514..84be3ad7773 100644 --- a/src/app/controllers/search.js +++ b/src/app/controllers/search.js @@ -16,10 +16,10 @@ function (angular, _, config, $) { $scope.giveSearchFocus = 0; $scope.selectedIndex = null; - keyboardManager.bind('shift+s', function() { + /*keyboardManager.bind('shift+s', function() { $element.find('.dropdown').addClass('open'); $scope.giveSearchFocus += 1; - }); + });*/ keyboardManager.bind('esc', function() { $element.find('.dropdown').removeClass('open'); diff --git a/src/app/panels/graphite/editor.html b/src/app/panels/graphite/editor.html index 06ab8844cd8..c21ca7479c0 100644 --- a/src/app/panels/graphite/editor.html +++ b/src/app/panels/graphite/editor.html @@ -1,13 +1,21 @@
-
+
+
+
+ + {{target.target}} + -
-
- - -
-
+ + + + + + + +
+
Add target diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graphite/module.html index 5f1d7f0f523..add55c0dbd8 100644 --- a/src/app/panels/graphite/module.html +++ b/src/app/panels/graphite/module.html @@ -1,4 +1,4 @@ -
+