IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(dragdrop): Fix for broken drag drop behavior, fixes #2558

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-08-20 11:12:06 +02:00
parent 0d8303cf5d
commit e5794ed1c1
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# 2.1.2 (unreleased) # 2.1.2 (unreleased)
**Fixes** **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 - [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
bower.json
View File

@ -18,7 +18,7 @@
"angular-route": "~1.4.3", "angular-route": "~1.4.3",
"angular-mocks": "~1.4.3", "angular-mocks": "~1.4.3",
"angular-sanitize": "~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", "angular-bindonce": "~0.3.3",
"requirejs": "~2.1.18", "requirejs": "~2.1.18",
"requirejs-text": "~2.0.14" "requirejs-text": "~2.0.14"

2
public/vendor/angular-native-dragdrop/.bower.json vendored
View File

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

2
public/vendor/angular-native-dragdrop/draganddrop.js vendored
View File

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