From ba5efdeaad6296a730e53d313102cd8efe58300b Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Fri, 6 Feb 2015 23:07:44 -0300 Subject: [PATCH 1/3] Replace version to the next SNAPSHOT --- core-js/pom.xml | 2 +- mindplot/pom.xml | 2 +- pom.xml | 4 ++-- web2d/pom.xml | 2 +- wise-editor/pom.xml | 2 +- wise-webapp/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core-js/pom.xml b/core-js/pom.xml index 9ecccc6f..c0e3b6d9 100644 --- a/core-js/pom.xml +++ b/core-js/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git diff --git a/mindplot/pom.xml b/mindplot/pom.xml index 89d71d36..a10b57d5 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 889ae58e..d20f9b0c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT ${project.basedir}/wise-webapps @@ -16,7 +16,7 @@ org.wisemapping wisemapping WiseMapping Project - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT pom diff --git a/web2d/pom.xml b/web2d/pom.xml index d5b9b533..20bb27fc 100644 --- a/web2d/pom.xml +++ b/web2d/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT diff --git a/wise-editor/pom.xml b/wise-editor/pom.xml index 0f6260ef..95b0a1a1 100644 --- a/wise-editor/pom.xml +++ b/wise-editor/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index 7839f859..f628d35a 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 4.0.0-SNAPSHOT + 4.0.1-SNAPSHOT From fd07af4f5f1483d5a1bd72a70cd8c4f65bd3b1f5 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Fri, 6 Feb 2015 00:54:39 -0300 Subject: [PATCH 2/3] fix keyboard throubles with ie11 --- .../main/javascript/MultilineTextEditor.js | 27 ++++++++++++++++--- mindplot/src/main/javascript/TextEditor.js | 1 + wise-editor/src/main/webapp/js/editor.js | 1 + 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/mindplot/src/main/javascript/MultilineTextEditor.js b/mindplot/src/main/javascript/MultilineTextEditor.js index c36efdac..8fe7900e 100644 --- a/mindplot/src/main/javascript/MultilineTextEditor.js +++ b/mindplot/src/main/javascript/MultilineTextEditor.js @@ -88,6 +88,17 @@ mindplot.MultilineTextEditor = new Class({ me.close(true); } break; + case 'tab': + event.preventDefault(); + var start = $(this).get(0).selectionStart; + var end = $(this).get(0).selectionEnd; + + // set textarea value to: text before caret + tab + text after caret + $(this).val($(this).val().substring(0, start) + "\t" + $(this).val().substring(end)); + + // put caret at right position again + $(this).get(0).selectionStart = $(this).get(0).selectionEnd = start + 1; + break; } event.stopPropagation(); }); @@ -248,24 +259,32 @@ mindplot.MultilineTextEditor = new Class({ _positionCursor:function (textareaElem, selectText) { textareaElem.focus(); + var lenght = textareaElem.val().length; if (selectText) { // Mark text as selected ... if (textareaElem.createTextRange) { var rang = textareaElem.createTextRange(); rang.select(); - rang.move("character", textareaElem.val().length); + rang.move("character", lenght); } else { - textareaElem[0].setSelectionRange(0, textareaElem.val().length); + textareaElem[0].setSelectionRange(0, lenght); } } else { // Move the cursor to the last character .. if (textareaElem.createTextRange) { var range = textareaElem.createTextRange(); - range.move("character", textareaElem.val().length); + range.move("character", lenght); } else { - textareaElem.selectionStart = textareaElem.val().length; + if (Browser.ie11) { + textareaElem[0].selectionStart = lenght; + textareaElem[0].selectionEnd = lenght; + } else { + textareaElem.selectionStart = lenght; + textareaElem.selectionEnd = lenght; + } + textareaElem.focus(); } } diff --git a/mindplot/src/main/javascript/TextEditor.js b/mindplot/src/main/javascript/TextEditor.js index 651d9143..911c6161 100644 --- a/mindplot/src/main/javascript/TextEditor.js +++ b/mindplot/src/main/javascript/TextEditor.js @@ -16,6 +16,7 @@ * limitations under the License. */ +//FIXME: Not used! mindplot.TextEditor = new Class({ initialize:function(topic) { this._topic = topic; diff --git a/wise-editor/src/main/webapp/js/editor.js b/wise-editor/src/main/webapp/js/editor.js index ec026f45..d9fb73af 100644 --- a/wise-editor/src/main/webapp/js/editor.js +++ b/wise-editor/src/main/webapp/js/editor.js @@ -31,6 +31,7 @@ Browser = { ie6: !window.XMLHttpRequest, ie7: document.all && window.XMLHttpRequest && !XDomainRequest && !window.opera, ie8: document.documentMode==8, + ie11: document.documentMode==11, opera: Boolean(window.opera), chrome: Boolean(window.chrome), safari: window.getComputedStyle && !window.globalStorage && !window.opera, From bd04bf2ea4066b68c36cc642fc228dddcdd2fa82 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Thu, 12 Feb 2015 22:58:28 -0300 Subject: [PATCH 3/3] fixing note edition --- mindplot/src/main/javascript/widget/NoteEditor.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mindplot/src/main/javascript/widget/NoteEditor.js b/mindplot/src/main/javascript/widget/NoteEditor.js index f19ac237..3f453c49 100644 --- a/mindplot/src/main/javascript/widget/NoteEditor.js +++ b/mindplot/src/main/javascript/widget/NoteEditor.js @@ -54,6 +54,9 @@ mindplot.widget.NoteEditor = new Class({ 'height':80, 'resize':'none' }); + textArea.on("keypress", function(event) { + event.stopPropagation(); + }); form.append(textArea); if (model.getValue() != null){