Merge remote-tracking branch 'origin/develop'

Conflicts: core-js/pom.xml mindplot/pom.xml pom.xml web2d/pom.xml wise-editor/pom.xml wise-webapp/pom.xml
2015-10-29 23:06:57 -03:00
parent 17be6f8443 a51846e536
commit 8db908912c
18 changed files with 219 additions and 52 deletions
--- a/wise-editor/pom.xml
+++ b/wise-editor/pom.xml
@@ -9,7 +9,7 @@
        <groupId>org.wisemapping</groupId>
        <artifactId>wisemapping</artifactId>
        <relativePath>../pom.xml</relativePath>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
    </parent>

    <dependencies>
--- a/wise-editor/src/main/webapp/js/editor.js
+++ b/wise-editor/src/main/webapp/js/editor.js
@@ -78,7 +78,7 @@ function buildDesigner(options) {
            headers: {"Content-Type": "application/json", "Accept": "application/json"},
            data: JSON.stringify({
                jsErrorMsg: "Message: '" + errorMsg + "', line:'" + lineNo + "', url: :" + url,
-                jsStack: window.errorStack,
+                jsStack: window.event.error.stack || window.errorStack,
                userAgent: navigator.userAgent,
                mapId: options.mapId
            })