Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
— | — | @@ -64,7 +64,7 @@ |
65 | 65 | array( 'src' => 'js/plugins/jquery.namespaceSelect.js', 'version' => 1 ), |
66 | 66 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 4 ), |
67 | 67 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 16 ), |
68 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 11 ), |
| 68 | + array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 12 ), |
69 | 69 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 12 ), |
70 | 70 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 4 ), |
71 | 71 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 18 ), |
— | — | @@ -73,10 +73,10 @@ |
74 | 74 | array( 'src' => 'js/js2/jquery-ui-1.7.2.js', 'version' => '1.7.2y' ), |
75 | 75 | ), |
76 | 76 | 'combined' => array( |
77 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 40 ), |
| 77 | + array( 'src' => 'js/plugins.combined.js', 'version' => 41 ), |
78 | 78 | ), |
79 | 79 | 'minified' => array( |
80 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 40 ), |
| 80 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 41 ), |
81 | 81 | ), |
82 | 82 | ), |
83 | 83 | ); |
Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
— | — | @@ -123,10 +123,10 @@ |
124 | 124 | textarea.select(); |
125 | 125 | textarea.setSelection( index, index + 3 ); |
126 | 126 | textarea.encapsulateSelection( '', 'BAR', '', false, true ); |
127 | | - if ( textarea.val().substr( -1 ) == 'R' ) |
| 127 | + if ( textarea.val().substr( -4 ) != 'BARr' ) |
128 | 128 | $.isOperaBroken = false; |
129 | 129 | else |
130 | | - $.isOperaBroken = true; |
| 130 | + $.isOperaBroken = true; |
131 | 131 | div.remove(); |
132 | 132 | } |
133 | 133 | if ( $.isOperaBroken ) |
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
— | — | @@ -1265,10 +1265,10 @@ |
1266 | 1266 | textarea.select(); |
1267 | 1267 | textarea.setSelection( index, index + 3 ); |
1268 | 1268 | textarea.encapsulateSelection( '', 'BAR', '', false, true ); |
1269 | | - if ( textarea.val().substr( -1 ) == 'R' ) |
| 1269 | + if ( textarea.val().substr( -4 ) != 'BARr' ) |
1270 | 1270 | $.isOperaBroken = false; |
1271 | 1271 | else |
1272 | | - $.isOperaBroken = true; |
| 1272 | + $.isOperaBroken = true; |
1273 | 1273 | div.remove(); |
1274 | 1274 | } |
1275 | 1275 | if ( $.isOperaBroken ) |
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
— | — | @@ -81,7 +81,7 @@ |
82 | 82 | $(this).trigger('scrollToPosition');});}});})(jQuery);(function($){$.wikiEditor={'modules':{},'instances':[],'browsers':{'ltr':{'msie':[['>=',7]],'firefox':[['>=',2],['!=','2.0'],['!=','2.0.0.1'],['!=','2.0.0.2'],['!=','2.0.0.3'],['!=','2.0.0.4']],'opera':[['>=',9.6]],'safari':[['>=',3.1]]},'rtl':{'msie':[['>=',8]],'firefox':[['>=',2],['!=','2.0'],['!=','2.0.0.1'],['!=','2.0.0.2'],['!=','2.0.0.3'],['!=','2.0.0.4']],'opera':[['>=',9.6]],'safari':[['>=',3.1]]}},imgPath:wgScriptPath+'/extensions/UsabilityInitiative/images/wikiEditor/'};$.wikiEditor.isSupportKnown=function(){return $.browser.name in $.wikiEditor.browsers[$('body.rtl').size()?'rtl':'ltr'];};$.wikiEditor.isSupported=function(){if(!$.wikiEditor.isSupportKnown){return true;} |
83 | 83 | var browser=$.wikiEditor.browsers[$('body.rtl').size()?'rtl':'ltr'][$.browser.name];for(condition in browser){var op=browser[condition][0];var val=browser[condition][1];if(typeof val=='string'){if(!(eval('$.browser.version'+op+'"'+val+'"'))){return false;}}else if(typeof val=='number'){if(!(eval('$.browser.versionNumber'+op+val))){return false;}}} |
84 | 84 | return true;};$.wikiEditor.autoMsg=function(object,property){if(typeof property=='object'){for(i in property){if(property[i]in object||property[i]+'Msg'in object){property=property[i];break;}}} |
85 | | -if(property in object){return object[property];}else if(property+'Msg'in object){return gM(object[property+'Msg']);}else{return'';}};$.wikiEditor.fixOperaBrokenness=function(s){if(typeof $.isOperaBroken=='undefined'&&$.wikiEditor.instances.length>0){var div=$('<div />').height(0).width(0).insertBefore($.wikiEditor.instances[0]);var textarea=$('<textarea />').height(0).appendTo(div).val("foo\r\nbar");var index=textarea.val().indexOf('bar');textarea.select();textarea.setSelection(index,index+3);textarea.encapsulateSelection('','BAR','',false,true);if(textarea.val().substr(-1)=='R') |
| 85 | +if(property in object){return object[property];}else if(property+'Msg'in object){return gM(object[property+'Msg']);}else{return'';}};$.wikiEditor.fixOperaBrokenness=function(s){if(typeof $.isOperaBroken=='undefined'&&$.wikiEditor.instances.length>0){var div=$('<div />').height(0).width(0).insertBefore($.wikiEditor.instances[0]);var textarea=$('<textarea />').height(0).appendTo(div).val("foo\r\nbar");var index=textarea.val().indexOf('bar');textarea.select();textarea.setSelection(index,index+3);textarea.encapsulateSelection('','BAR','',false,true);if(textarea.val().substr(-4)!='BARr') |
86 | 86 | $.isOperaBroken=false;else |
87 | 87 | $.isOperaBroken=true;div.remove();} |
88 | 88 | if($.isOperaBroken) |