vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-12-22 19:33:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-js/pom.xml
View File

@ -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>

2
mindplot/pom.xml
View File

@ -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>

27
mindplot/src/main/javascript/MultilineTextEditor.js
View File

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

1
mindplot/src/main/javascript/TextEditor.js
View File

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

3
mindplot/src/main/javascript/widget/NoteEditor.js
View File

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

4
pom.xml
View File

@ -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>

2
web2d/pom.xml
View File

@ -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>

2
wise-editor/pom.xml
View File

@ -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>

1
wise-editor/src/main/webapp/js/editor.js
View File

@ -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,

2
wise-webapp/pom.xml
View File

@ -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>