Merge branch 'master' of github.com:grafana/grafana

public/app/panels/table/editor.html

@@ -132,6 +132,9 @@
 						<spectrum-picker ng-model="style.colors[1]" ng-change="render()" ></spectrum-picker>
 						<spectrum-picker ng-model="style.colors[2]" ng-change="render()" ></spectrum-picker>
 					</li>
+					<li class="tight-form-item last">
+						<a class="pointer" ng-click="invertColorOrder($index)">invert order</a>
+					</li>
 				</ul>
 				<div class="clearfix"></div>
 			</div>

public/app/panels/table/editor.ts

@@ -101,6 +101,14 @@ export class TablePanelEditorCtrl {
       });
     };
 
+    $scope.invertColorOrder = function(index) {
+      var ref = $scope.panel.styles[index].colors;
+      var copy = ref[0];
+      ref[0] = ref[2];
+      ref[2] = copy;
+      $scope.render();
+    };
+
   }
 }
 

public/app/require_config.js

@@ -35,7 +35,6 @@ require.config({
     modernizr:                 'vendor/modernizr-2.6.1',
 
     'bootstrap-tagsinput':    'vendor/tagsinput/bootstrap-tagsinput',
-    'aws-sdk':                'vendor/aws-sdk/dist/aws-sdk.min',
   },
 
   shim: {