annotations: removing wip stuff so I can merge to master

public/app/features/annotations/partials/editor.html

@@ -77,17 +77,17 @@
 					</div>
 					<div class="gf-form-group">
 						<div class="gf-form-inline">
-							<div class="gf-form">
-								<span class="gf-form-label width-7">Show in</span>
-								<div class="gf-form-select-wrapper width-12">
-									<select class="gf-form-input" ng-model="ctrl.currentAnnotation.showIn" ng-options="f.value as f.text for f in ctrl.showOptions"></select>
-								</div>
-							</div>
+							<!-- <div class="gf&#45;form"> -->
+							<!-- 	<span class="gf&#45;form&#45;label width&#45;7">Show in</span> -->
+							<!-- 	<div class="gf&#45;form&#45;select&#45;wrapper width&#45;12"> -->
+							<!-- 		<select class="gf&#45;form&#45;input" ng&#45;model="ctrl.currentAnnotation.showIn" ng&#45;options="f.value as f.text for f in ctrl.showOptions"></select> -->
+							<!-- 	</div> -->
+							<!-- </div> -->
 							<gf-form-switch class="gf-form"
 															label="Hide toggle"
 															tooltip="Hides the annotation query toggle from showing at the top of the dashboard"
 															checked="ctrl.currentAnnotation.hide"
-															label-class="width-9">
+															label-class="width-7">
 							</gf-form-switch>
 						</div>
 						<div class="gf-form">

public/app/plugins/panel/graph/graph.ts

@@ -592,9 +592,9 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
 
       elem.bind("plotselected", function (event, ranges) {
         if (ranges.ctrlKey || ranges.metaKey)  {
-          scope.$apply(() => {
-            eventManager.updateTime(ranges.xaxis);
-          });
+          // scope.$apply(() => {
+          //   eventManager.updateTime(ranges.xaxis);
+          // });
         } else {
           scope.$apply(function() {
             timeSrv.setTime({
@@ -610,9 +610,9 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
           // Skip if range selected (added in "plotselected" event handler)
           let isRangeSelection = pos.x !== pos.x1;
           if (!isRangeSelection) {
-            scope.$apply(() => {
-              eventManager.updateTime({from: pos.x, to: null});
-            });
+            // scope.$apply(() => {
+            //   eventManager.updateTime({from: pos.x, to: null});
+            // });
           }
         }
       });

public/app/plugins/panel/graph/module.ts

@@ -144,7 +144,6 @@ class GraphCtrl extends MetricsPanelCtrl {
     actions.push({text: 'Export CSV (series as rows)', click: 'ctrl.exportCsv()'});
     actions.push({text: 'Export CSV (series as columns)', click: 'ctrl.exportCsvColumns()'});
     actions.push({text: 'Toggle legend', click: 'ctrl.toggleLegend()'});
-    actions.push({ text: 'Add Annotation', click: 'ctrl.enableAddAnnotationMode()' });
   }
 
   issueQueries(datasource) {
@@ -301,11 +300,6 @@ class GraphCtrl extends MetricsPanelCtrl {
     this.refresh();
   }
 
-  enableAddAnnotationMode() {
-    // placehoder for some other way to teach users
-    alert('selection region while holding down CTRL or CMD');
-  }
-
   legendValuesOptionChanged() {
     var legend = this.panel.legend;
     legend.values = legend.min || legend.max || legend.avg || legend.current || legend.total;