Merge branch 'develop'

Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
This commit is contained in:
Paulo Gustavo Veiga 2015-02-21 13:08:22 -03:00
commit eefad1c7f6
10 changed files with 35 additions and 11 deletions

View File

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

View File

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

View File

@ -88,6 +88,17 @@ mindplot.MultilineTextEditor = new Class({
me.close(true); me.close(true);
} }
break; 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(); event.stopPropagation();
}); });
@ -248,24 +259,32 @@ mindplot.MultilineTextEditor = new Class({
_positionCursor:function (textareaElem, selectText) { _positionCursor:function (textareaElem, selectText) {
textareaElem.focus(); textareaElem.focus();
var lenght = textareaElem.val().length;
if (selectText) { if (selectText) {
// Mark text as selected ... // Mark text as selected ...
if (textareaElem.createTextRange) { if (textareaElem.createTextRange) {
var rang = textareaElem.createTextRange(); var rang = textareaElem.createTextRange();
rang.select(); rang.select();
rang.move("character", textareaElem.val().length); rang.move("character", lenght);
} }
else { else {
textareaElem[0].setSelectionRange(0, textareaElem.val().length); textareaElem[0].setSelectionRange(0, lenght);
} }
} else { } else {
// Move the cursor to the last character .. // Move the cursor to the last character ..
if (textareaElem.createTextRange) { if (textareaElem.createTextRange) {
var range = textareaElem.createTextRange(); var range = textareaElem.createTextRange();
range.move("character", textareaElem.val().length); range.move("character", lenght);
} else { } 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();
} }
} }

View File

@ -16,6 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
//FIXME: Not used!
mindplot.TextEditor = new Class({ mindplot.TextEditor = new Class({
initialize:function(topic) { initialize:function(topic) {
this._topic = topic; this._topic = topic;

View File

@ -54,6 +54,9 @@ mindplot.widget.NoteEditor = new Class({
'height':80, 'height':80,
'resize':'none' 'resize':'none'
}); });
textArea.on("keypress", function(event) {
event.stopPropagation();
});
form.append(textArea); form.append(textArea);
if (model.getValue() != null){ if (model.getValue() != null){

View File

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

View File

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

View File

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

View File

@ -31,6 +31,7 @@ Browser = {
ie6: !window.XMLHttpRequest, ie6: !window.XMLHttpRequest,
ie7: document.all && window.XMLHttpRequest && !XDomainRequest && !window.opera, ie7: document.all && window.XMLHttpRequest && !XDomainRequest && !window.opera,
ie8: document.documentMode==8, ie8: document.documentMode==8,
ie11: document.documentMode==11,
opera: Boolean(window.opera), opera: Boolean(window.opera),
chrome: Boolean(window.chrome), chrome: Boolean(window.chrome),
safari: window.getComputedStyle && !window.globalStorage && !window.opera, safari: window.getComputedStyle && !window.globalStorage && !window.opera,

View File

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