Refs wymeditor#249. Upgraded rangy to 1.1.2 to take advantage of rang…

…y.getIframeSelection
winhamwr · Jun 24, 2011 · eee0c2d · eee0c2d
1 parent 4a35df9
commit eee0c2d
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 122 deletions.
diff --git a/src/test/unit/table_test.js b/src/test/unit/table_test.js
@@ -85,8 +85,7 @@ function testRowMerge(
 
     // Use rangy to get a cross-browser selection object and perform the actual
     // merge
-    var iframeWin = wymeditor._iframe.contentDocument ? wymeditor._iframe.contentDocument.defaultView : wymeditor._iframe.contentWindow;
-    var sel = rangy.getSelection(iframeWin);
+    var sel = rangy.getIframeSelection(wymeditor._iframe);
     var changesMade = wymeditor.tableEditor.mergeRow(sel);
     equals(changesMade, true);
 

diff --git a/src/test/unit/utils.js b/src/test/unit/utils.js
@@ -108,8 +108,7 @@ function makeSelection(
 	if (endElementIndex == null) {
 		endElementIndex = 0;
 	}
-	var iframeWin = wymeditor._iframe.contentDocument ? wymeditor._iframe.contentDocument.defaultView : wymeditor._iframe.contentWindow;
-	var sel = rangy.getSelection(iframeWin);
+	var sel = rangy.getIframeSelection(wymeditor._iframe);
 
 	var range = rangy.createRange(wymeditor._doc);
 	range.setStart(startElement, startElementIndex);

diff --git a/src/wymeditor/plugins/rangy/jquery.wymeditor.rangy.js b/src/wymeditor/plugins/rangy/jquery.wymeditor.rangy.js
@@ -24,9 +24,7 @@
         if(window.rangy && !rangy.initialized) rangy.init();
 
         var iframe = this._iframe;
-        var win = (iframe.contentDocument && iframe.contentDocument.defaultView) ?
-          iframe.contentDocument.defaultView : iframe.contentWindow;
-        var sel = rangy.getSelection(win);
+        var sel = rangy.getIframeSelection(iframe);
 
         return(sel);
       };
@@ -50,7 +48,7 @@
       WYMeditor.editor.prototype.selection_collapsed = function() {
         var sel = this.selection();
         var collapsed = false;
-        
+
         $.each(sel.getAllRanges(), function() {
           if(this.collapsed) {
             collapsed = true;
@@ -61,15 +59,15 @@
 
         return(collapsed);
       };
-      
+
       /* @name selected_contains
        * @description Returns an array of nodes that match a jQuery selector
        * within the current selection.
        */
       WYMeditor.editor.prototype.selected_contains = function(selector) {
         var sel = this.selection();
         var matches = [];
-        
+
         $.each(sel.getAllRanges(), function() {
           $.each(this.getNodes(), function() {
             if($(this).is(selector)) {

diff --git a/src/wymeditor/plugins/rangy/rangy-core.js b/src/wymeditor/plugins/rangy/rangy-core.js
diff --git a/src/wymeditor/plugins/rangy/rangy-cssclassapplier.js b/src/wymeditor/plugins/rangy/rangy-cssclassapplier.js
diff --git a/src/wymeditor/plugins/rangy/rangy-selectionsaverestore.js b/src/wymeditor/plugins/rangy/rangy-selectionsaverestore.js