From e5794ed1c195c28b6ac1b245393aa800ffb0a461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 20 Aug 2015 11:12:06 +0200
Subject: [PATCH 1/2] fix(dragdrop): Fix for broken drag drop behavior, fixes
 #2558

---
 CHANGELOG.md                                         | 1 +
 bower.json                                           | 2 +-
 public/vendor/angular-native-dragdrop/.bower.json    | 2 +-
 public/vendor/angular-native-dragdrop/draganddrop.js | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10d1a0e9636..046d6f337ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 2.1.2 (unreleased)
 
 **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
 
 
diff --git a/bower.json b/bower.json
index ed574b93c98..88cb0b3df4a 100644
--- a/bower.json
+++ b/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"
diff --git a/public/vendor/angular-native-dragdrop/.bower.json b/public/vendor/angular-native-dragdrop/.bower.json
index 79dabd89c29..6cef5b66f76 100644
--- a/public/vendor/angular-native-dragdrop/.bower.json
+++ b/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"
 }
\ No newline at end of file
diff --git a/public/vendor/angular-native-dragdrop/draganddrop.js b/public/vendor/angular-native-dragdrop/draganddrop.js
index 63eb5d78c55..5aa417ad2e6 100755
--- a/public/vendor/angular-native-dragdrop/draganddrop.js
+++ b/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;

From e86c87f7bc833d659d16aa7f2bb49cba0f2e6b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 20 Aug 2015 11:12:32 +0200
Subject: [PATCH 2/2] updated version to v2.1.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 241eb07c643..8cde5157172 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "2.1.1-pre1",
+  "version": "2.1.2",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"