Merge branch 'develop'

Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml

core-js/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
     <scm>
         <developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>

mindplot/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
 
     <dependencies>

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();
             }
         }
 

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;

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){

pom.xml

@@ -4,7 +4,7 @@
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <properties>
-        <com.wisemapping.version>4.0.0</com.wisemapping.version>
+        <com.wisemapping.version>4.0.1</com.wisemapping.version>
         <superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
     </properties>
 
@@ -16,7 +16,7 @@
     <groupId>org.wisemapping</groupId>
     <artifactId>wisemapping</artifactId>
     <name>WiseMapping Project</name>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <packaging>pom</packaging>
 
     <licenses>

web2d/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
 
     <build>

wise-editor/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
 
     <dependencies>

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,

wise-webapp/pom.xml

@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
     </parent>
 
     <repositories>