Merge branch 'v2.1.x'

Conflicts:
	CHANGELOG.md
	package.json

CHANGELOG.md

@@ -20,6 +20,7 @@ data source api change.
 # 2.1.x (currently unreleased patch branch)
 
 **Fixes**
+- [Issue #2558](https://github.com/grafana/grafana/issues/2558). DragDrop: Fix for broken drag drop behavior
 - [Issue #2534](https://github.com/grafana/grafana/issues/2534). Templating: fix for setting template variable value via url and having repeated panels or rows
 
 # 2.1.1 (2015-08-11)

bower.json

@@ -18,7 +18,7 @@
     "angular-route": "~1.4.3",
     "angular-mocks": "~1.4.3",
     "angular-sanitize": "~1.4.3",
-    "angular-native-dragdrop": "~1.1.0",
+    "angular-native-dragdrop": "~1.1.1",
     "angular-bindonce": "~0.3.3",
     "requirejs": "~2.1.18",
     "requirejs-text": "~2.0.14"

public/vendor/angular-native-dragdrop/.bower.json

@@ -31,6 +31,6 @@
     "commit": "4ff89cb0aa61070508e935729fb816fd46a58f60"
   },
   "_source": "git://github.com/angular-dragdrop/angular-dragdrop.git",
-  "_target": "~1.1.0",
+  "_target": "~1.1.1",
   "_originalSource": "angular-native-dragdrop"
 }

public/vendor/angular-native-dragdrop/draganddrop.js

@@ -7,7 +7,7 @@
 
     function determineEffectAllowed(e) {
         // Chrome doesn't set dropEffect, so we have to work it out ourselves
-        if (e.dataTransfer.dropEffect === 'none') {
+        if (e.dataTransfer && e.dataTransfer.dropEffect === 'none') {
             if (e.dataTransfer.effectAllowed === 'copy' ||
                 e.dataTransfer.effectAllowed === 'move') {
                 e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed;