From 65e7f2ce63cf8e6fa293d752d558954c94c74621 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 24 Jun 2012 21:51:04 -0300 Subject: [PATCH] - Disable text selection on IE 9. --- mindplot/src/main/javascript/widget/Menu.js | 10 +++++----- wise-editor/src/main/webapp/css/compatibility.less | 5 ----- wise-editor/src/main/webapp/css/editor.less | 6 ++++++ wise-editor/src/main/webapp/html/drag.html | 2 +- wise-editor/src/main/webapp/html/editor.html | 4 ++-- wise-editor/src/main/webapp/html/embedded.html | 2 +- wise-editor/src/main/webapp/html/viewmode.html | 2 +- wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp | 2 +- wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index d70d07af..6b229df6 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -207,7 +207,7 @@ mindplot.widget.Menu = new Class({ } this._addButton('export', false, false, function() { - var reqDialog = new MooDialog.Request('c/iframeWrapper.htm?url=c/maps/' + mapId + "/exportf", null, + var reqDialog = new MooDialog.Request('/c/iframeWrapper.htm?url=c/maps/' + mapId + "/exportf", null, {'class': 'modalDialog exportModalDialog', closeButton:true, destroyOnClose:true, @@ -223,7 +223,7 @@ mindplot.widget.Menu = new Class({ this._registerTooltip('export', "Export"); this._addButton('print', false, false, function() { - window.open('c/maps/' + mapId + '/print'); + window.open('/c/maps/' + mapId + '/print'); }); this._registerTooltip('print', "Print"); @@ -348,7 +348,7 @@ mindplot.widget.Menu = new Class({ var shareElem = $('shareIt'); if (shareElem) { this._addButton('shareIt', false, false, function() { - var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/sharef", null, + var reqDialog = new MooDialog.Request('/c/iframeWrapper?url=c/maps/' + mapId + "/sharef", null, {'class': 'modalDialog shareModalDialog', closeButton:true, destroyOnClose:true, @@ -368,7 +368,7 @@ mindplot.widget.Menu = new Class({ var publishElem = $('publishIt'); if (publishElem) { this._addButton('publishIt', false, false, function() { - var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/publishf", null, + var reqDialog = new MooDialog.Request('/c/iframeWrapper?url=c/maps/' + mapId + "/publishf", null, {'class': 'modalDialog publishModalDialog', closeButton:true, destroyOnClose:true, @@ -389,7 +389,7 @@ mindplot.widget.Menu = new Class({ if (historyElem) { this._addButton('history', false, false, function() { - var reqDialog = new MooDialog.Request('c/iframeWrapper?url=c/maps/' + mapId + "/historyf", null, + var reqDialog = new MooDialog.Request('/c/iframeWrapper?url=c/maps/' + mapId + "/historyf", null, {'class': 'modalDialog historyModalDialog', closeButton:true, destroyOnClose:true, diff --git a/wise-editor/src/main/webapp/css/compatibility.less b/wise-editor/src/main/webapp/css/compatibility.less index 54b6152c..cab9e3ec 100644 --- a/wise-editor/src/main/webapp/css/compatibility.less +++ b/wise-editor/src/main/webapp/css/compatibility.less @@ -51,11 +51,6 @@ body { font: 13px arial, helvetica, clean, sans-serif; font-size: small; font: x-small; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -o-user-select: none; - user-select: none; } table { diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less index 1c4f9a36..892132b9 100644 --- a/wise-editor/src/main/webapp/css/editor.less +++ b/wise-editor/src/main/webapp/css/editor.less @@ -7,6 +7,12 @@ @import "header.less"; body { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; overflow:hidden; } diff --git a/wise-editor/src/main/webapp/html/drag.html b/wise-editor/src/main/webapp/html/drag.html index 7170252e..9e47e795 100644 --- a/wise-editor/src/main/webapp/html/drag.html +++ b/wise-editor/src/main/webapp/html/drag.html @@ -216,7 +216,7 @@
Text Node !!
-
+
diff --git a/wise-editor/src/main/webapp/html/editor.html b/wise-editor/src/main/webapp/html/editor.html index 3539f0ee..16160c7f 100644 --- a/wise-editor/src/main/webapp/html/editor.html +++ b/wise-editor/src/main/webapp/html/editor.html @@ -21,7 +21,7 @@ diff --git a/wise-editor/src/main/webapp/html/embedded.html b/wise-editor/src/main/webapp/html/embedded.html index 425863c3..f693e5f4 100644 --- a/wise-editor/src/main/webapp/html/embedded.html +++ b/wise-editor/src/main/webapp/html/embedded.html @@ -135,7 +135,7 @@ -
+
diff --git a/wise-editor/src/main/webapp/html/viewmode.html b/wise-editor/src/main/webapp/html/viewmode.html index f1bd225f..04bcb216 100644 --- a/wise-editor/src/main/webapp/html/viewmode.html +++ b/wise-editor/src/main/webapp/html/viewmode.html @@ -51,7 +51,7 @@ -
+
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 626dd1d8..7988e75a 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -77,7 +77,7 @@ <%@ include file="/jsp/mindmapEditorToolbar.jsf" %> -
+
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp index 81dbbe5d..700965c6 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp @@ -71,7 +71,7 @@
-
+