diff --git a/demos/listmap2/index.html b/demos/listmap2/index.html
index 5ddfb269..b70c2bec 100644
--- a/demos/listmap2/index.html
+++ b/demos/listmap2/index.html
@@ -3,7 +3,7 @@
OxJS ListMap Demo (async)
-
+
diff --git a/demos/mouse/index.html b/demos/mouse/index.html
index 89908496..71352de8 100644
--- a/demos/mouse/index.html
+++ b/demos/mouse/index.html
@@ -3,7 +3,7 @@
OxJS Mouse Events Demo
-
+
diff --git a/source/Ox.UI/js/Core/Ox.DocPanel.js b/source/Ox.UI/js/Core/Ox.DocPanel.js
index a66ad3e6..5320cc08 100644
--- a/source/Ox.UI/js/Core/Ox.DocPanel.js
+++ b/source/Ox.UI/js/Core/Ox.DocPanel.js
@@ -164,7 +164,6 @@ Ox.DocPanel = function(options, self) {
});
}
}
- that.triggerEvent('select', data);
}
function sortByTitle(a, b) {
diff --git a/source/Ox.UI/js/Core/Ox.Element.js b/source/Ox.UI/js/Core/Ox.Element.js
index 45152429..9f72c9a1 100644
--- a/source/Ox.UI/js/Core/Ox.Element.js
+++ b/source/Ox.UI/js/Core/Ox.Element.js
@@ -158,6 +158,7 @@ Ox.Element = function(options, self) {
if (!self.mouseTimeout) {
// first mousedown
that.triggerEvent('mousedown', e);
+ self.drag = false;
self.mouseup = false;
self.mouseTimeout = setTimeout(function() {
// 250 ms later, no subsequent click
@@ -199,6 +200,7 @@ Ox.Element = function(options, self) {
// trigger dragend
that.triggerEvent('dragend', extend(e));
});
+ self.drag = true;
}
}, 250);
} else {
@@ -233,7 +235,7 @@ Ox.Element = function(options, self) {
that.triggerEvent('mouserepeat', e);
}
function mouseup(e) {
- if (!self.mouseup) {
+ if (!self.mouseup && !self.drag) {
// mouse went up for the first time, trigger anyclick
that.triggerEvent('anyclick', e);
self.mouseup = true;