Merge pull request #3795 from mkoistinen/mkoistinen-feature/fix_3688

Fix for #3688
django-cms · Jan 29, 2015 · 077066b · 077066b
2 parents 86fa9ac + 029442f
commit 077066b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/cms/static/cms/js/modules/cms.clipboard.js b/cms/static/cms/js/modules/cms.clipboard.js
@@ -30,7 +30,7 @@ $(document).ready(function () {
 			this.triggerRemove = this.clipboard.find('.cms_clipboard-empty a');
 
 			// states
-			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'touchend.cms';
+			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'touchend.cms click.cms';
 			this.timer = function () {};
 
 			// setup initial stuff

diff --git a/cms/static/cms/js/modules/cms.modal.js b/cms/static/cms/js/modules/cms.modal.js
@@ -32,7 +32,7 @@ $(document).ready(function () {
 			this.toolbar = $('.cms_toolbar');
 
 			// states
-			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'touchend.cms';
+			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'touchend.cms click.cms';
 			this.maximized = false;
 			this.minimized = false;
 			this.triggerMaximized = false;

diff --git a/cms/static/cms/js/modules/cms.plugins.js b/cms/static/cms/js/modules/cms.plugins.js
@@ -42,7 +42,7 @@ $(document).ready(function () {
 			this.timer = function () {};
 			this.timeout = 250;
 			this.focused = false;
-			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'tap.cms';
+			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'tap.cms click.cms';
 
 			// bind data element to the container
 			this.container.data('settings', this.options);

diff --git a/cms/static/cms/js/modules/cms.sideframe.js b/cms/static/cms/js/modules/cms.sideframe.js
@@ -30,7 +30,7 @@ $(document).ready(function () {
 			this.body = $('html');
 
 			// states
-			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'touchend.cms';
+			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'touchend.cms click.cms';
 			this.enforceReload = false;
 
 			// if the modal is initialized the first time, set the events

diff --git a/cms/static/cms/js/modules/cms.structureboard.js b/cms/static/cms/js/modules/cms.structureboard.js
@@ -34,7 +34,7 @@ $(document).ready(function () {
 			this.clipboard = $('.cms_clipboard');
 
 			// states
-			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'tap.cms';
+			this.click = (document.ontouchstart !== null) ? 'click.cms' : 'tap.cms click.cms';
 			this.timer = function () {};
 			this.interval = function () {};
 			this.state = false;