Merge pull request #2 from NICTA/dragDrop

Don't allow drag/drop into modal dialogs.
TerriaJS · May 11, 2015 · 56f5c18 · 56f5c18
2 parents be7e266 + a46ad31
commit 56f5c18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Change Log
 * Elminated distracting "jumping" of the selection indicator when picking point features while zoomed in very close to the surface.
 * Fixed a bug that caused features to be picked from all layers in an Esri MapServer, instead of just the visible ones.
 * Added support for the WMS MinScaleDenominator property and the Esri MapServer maxScale property, preventing layers from disappearing when zoomed in to close to the surface.
+* Fixed a bug that could cause the "Drop a data file anywhere" message to get stuck on when dragging a file over the application while a modal dialog was open.
 
 ### 2015-04-15
 

diff --git a/index.js b/index.js
@@ -243,7 +243,9 @@ terria.start({
         terria: terria,
         dropTarget: document,
         allowDropInitFiles: true,
-        allowDropDataFiles: true
+        allowDropDataFiles: true,
+        validDropElements: ['ui', 'cesiumContainer'],
+        invalidDropClasses: ['modal-background']
     });
 
     // Make sure only one panel is open in the top right at any time.