4.3.1.1366

Stable version
wiris · May 9, 2017 · 07fa755 · 07fa755
1 parent 79bf157
commit 07fa755
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.3.0.1365
+4.3.1.1366
diff --git a/tinymce/VERSION b/tinymce/VERSION
@@ -1 +1 @@
-4.3.0.1365
+4.3.1.1366
diff --git a/tinymce/core/core.js b/tinymce/core/core.js
@@ -2091,8 +2091,14 @@ function wrs_openEditorWindow(language, target, isIframe) {
     }
 
     try {
-        var selection = target.contentWindow.getSelection();
-        _wrs_range = selection.getRangeAt(0);
+        if (isIframe) {
+            var selection = target.contentWindow.getSelection();
+            _wrs_range = selection.getRangeAt(0);
+        }
+        else {
+            var selection = getSelection();
+            _wrs_range = selection.getRangeAt(0);
+        }
     }
     catch (e) {
         _wrs_range = null;
@@ -4534,7 +4540,9 @@ ModalWindow.prototype.hideKeyboard = function() {
           }, 200);
     };
     // ...focus function changes scroll value, so we need to restore it.
-    var keepScroll = scrollY;
-    field.focus();
-    window.scrollTo(0, keepScroll);
+    if (typeof scrollY != 'undefined') {
+        var keepScroll = scrollY;
+        field.focus();
+        window.scrollTo(0, keepScroll);
+    }
 }
diff --git a/version.php b/version.php
@@ -27,7 +27,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->version   = 2017050800;
-$plugin->release = '4.3.0.1365';
+$plugin->release = '4.3.1.1366';
 $plugin->requires  = 2012120300;
 $plugin->component = 'tinymce_tiny_mce_wiris';
 $plugin->dependencies = array ('filter_wiris' => 2017050800);