qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1767738 - in /qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid: common/util.js management/dashboard/widget/query.js management/dashboard/widget/unavailable.js
Date Wed, 02 Nov 2016 17:02:47 GMT
Author: orudyy
Date: Wed Nov  2 17:02:47 2016
New Revision: 1767738

URL: http://svn.apache.org/viewvc?rev=1767738&view=rev
Log:
QPID-7488: Stop propagation of 'mouse down' events from widget icons in order to prevent false
triggering of widget dragging in IE

Modified:
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1767738&r1=1767737&r2=1767738&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Wed Nov  2 17:02:47 2016
@@ -988,5 +988,16 @@ define(["dojo/_base/xhr",
             return serializedUserName;
         };
 
+        util.stopEventPropagation = function(domNode, eventName)
+        {
+            on(domNode, eventName, function(evt)
+            {
+                if (evt)
+                {
+                    evt.stopPropagation();
+                }
+            });
+        }
+
         return util;
     });

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js?rev=1767738&r1=1767737&r2=1767738&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
(original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
Wed Nov  2 17:02:47 2016
@@ -201,6 +201,7 @@ define(["dojo/_base/declare",
                             if (settingsIconNodes && settingsIconNodes.length ==
1)
                             {
                                 settingsIconNodes[0].title = "Configure the settings of this
widget.";
+                                util.stopEventPropagation(settingsIconNodes[0], "mousedown");
                             }
                         }
                     });
@@ -208,11 +209,13 @@ define(["dojo/_base/declare",
                     if (portlet.closeIcon)
                     {
                         portlet.closeIcon.title = "Remove this query from the dashboard.";
+                        util.stopEventPropagation(portlet.closeIcon, "mousedown");
                     }
 
                     if (portlet.arrowNode)
                     {
                         portlet.arrowNode.title = "Maximise/minimise this widget.";
+                        util.stopEventPropagation(portlet.arrowNode, "mousedown");
                     }
 
                     portlet._preferenceAccessIcon = portlet._createIcon("preferenceAccessIcon",
@@ -228,6 +231,7 @@ define(["dojo/_base/declare",
                             this.controller.showTab(tabData);
                         }));
                     portlet._preferenceAccessIcon.title = "Open this query in a separate
tab.";
+                    util.stopEventPropagation(portlet._preferenceAccessIcon, "mousedown");
 
                     var settings = new QueryWidgetSettings();
                     settings.set("limit", this.limit);

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js?rev=1767738&r1=1767737&r2=1767738&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
(original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
Wed Nov  2 17:02:47 2016
@@ -24,14 +24,16 @@ define(["dojo/_base/declare",
         "dojo/Deferred",
         "dojo/Evented",
         "dojox/widget/Portlet",
-        "qpid/common/MessageDialog"],
+        "qpid/common/MessageDialog",
+        "qpid/common/util"],
     function (declare,
               lang,
               json,
               Deferred,
               Evented,
               Portlet,
-              MessageDialog)
+              MessageDialog,
+              util)
     {
 
         return declare(Evented, {
@@ -66,11 +68,13 @@ define(["dojo/_base/declare",
                 if (portlet.closeIcon)
                 {
                     portlet.closeIcon.title = "Remove this query from the dashboard.";
+                    util.stopEventPropagation(portlet.closeIcon, "mousedown");
                 }
 
                 if (portlet.arrowNode)
                 {
                     portlet.arrowNode.title = "Maximise/minimise this widget.";
+                    util.stopEventPropagation(portlet.arrowNode, "mousedown");
                 }
 
                 portlet.on("hide", lang.hitch(this, function(){



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message