Merge remote-tracking branch 'origin/develop' into fix-broken-pane-to…

…ggle
cmv · Oct 6, 2016 · 1a2af13 · 1a2af13
2 parents 1fafd15 + efc0ee8
commit 1a2af13
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/viewer/css/cmv-theme-overrides.css b/viewer/css/cmv-theme-overrides.css
@@ -4,6 +4,7 @@
 
 .cmv .dijitTitlePane {
     margin-bottom: 2px;
+    background-color: #FFF;
 }
 
 .cmv .dijitTitlePaneTitle {
@@ -191,7 +192,6 @@
 
 .flat .dijitTitlePaneTitle {
     border: 1px solid #DDD;
-    border-bottom: none;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     padding: 8px 15px;

diff --git a/viewer/index.html b/viewer/index.html
@@ -12,12 +12,12 @@
         <link rel="shortcut icon" href="./favicon.png">
         <title>Configurable Map Viewer</title>
         <link rel="stylesheet" type="text/css" href="https://js.arcgis.com/3.18compact/esri/css/esri.css">
-        <link rel="stylesheet" type="text/css" href="css/theme/dbootstrap/dbootstrap.css">
+        <link rel="stylesheet" type="text/css" href="css/theme/flat/flat.css">
         <link rel="stylesheet" type="text/css" href="css/cmv-theme-overrides.css">
         <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
         <link rel="stylesheet" type="text/css" href="css/main.css">
     </head>
-    <body class="cmv dbootstrap">
+    <body class="cmv flat">
         <div class="appHeader">
             <div class="headerLogo">
                 <img alt="logo" src="images/rocket-logo.png" height="54" />

diff --git a/viewer/js/gis/dijit/FloatingTitlePane.js b/viewer/js/gis/dijit/FloatingTitlePane.js
@@ -6,6 +6,7 @@ define([
     'dojo/dnd/Moveable',
     'dojo/aspect',
     'dojo/topic',
+    'dojo/sniff',
     'dojo/_base/window',
     'dojo/window',
     'dojo/dom-geometry',
@@ -16,7 +17,7 @@ define([
     'dojox/layout/ResizeHandle',
     'xstyle/css!dojox/layout/resources/ResizeHandle.css',
     'xstyle/css!./FloatingTitlePane/css/FloatingTitlePane.css'
-], function (declare, TitlePane, on, lang, Moveable, aspect, topic, win, winUtils, domGeom, domStyle, domConstruct, domAttr, domClass, ResizeHandle) {
+], function (declare, TitlePane, on, lang, Moveable, aspect, topic, has, win, winUtils, domGeom, domStyle, domConstruct, domAttr, domClass, ResizeHandle) {
 
     return declare([TitlePane], {
         sidebarPosition: null,
@@ -41,8 +42,12 @@ define([
         },
         startup: function () {
             if (this.titleBarNode && this.canFloat) {
+                if (has('edge') || has('trident')) {
+                    this.dragDelay = 0;
+                }
                 this._moveable = new Moveable(this.domNode, {
-                    handle: this.titleBarNode
+                    handle: this.titleBarNode,
+                    delay: this.dragDelay
                 });
                 this._titleBarHeight = domStyle.get(this.titleBarNode, 'height');
                 aspect.after(this._moveable, 'onMove', lang.hitch(this, '_dragging'), true);
@@ -100,12 +105,7 @@ define([
         },
 
         /* Methods for Dragging */
-        _dragging: function (mover) {
-            // add our own delay since the movable delay
-            // property breaks in all versions of Internet Explorer
-            if (Math.abs(mover.marginBox.l - this._moverBox.l) <= this.dragDelay || Math.abs(mover.marginBox.t - this._moverBox.t) <= this.dragDelay) {
-                return;
-            }
+        _dragging: function () {
             this.isDragging = true;
             if (!this.titleCursor) {
                 this.titleCursor = domStyle.get(this.titleBarNode, 'cursor');