Author: orudyy
Date: Thu Nov 3 14:30:35 2016
New Revision: 1767891
URL: http://svn.apache.org/viewvc?rev=1767891&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
merged from trunk using
svn merge -c 1767738 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 3 14:30:35 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767825,1767882
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767882
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1767891&r1=1767890&r2=1767891&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Thu Nov 3 14:30:35 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/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js?rev=1767891&r1=1767890&r2=1767891&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
(original)
+++
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
Thu Nov 3 14:30:35 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/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js?rev=1767891&r1=1767890&r2=1767891&view=diff
==============================================================================
---
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
(original)
+++
qpid/java/branches/6.1.x/broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
Thu Nov 3 14:30:35 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: [email protected]
For additional commands, e-mail: [email protected]
