| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -71,7 +71,7 @@ |
| 72 | 72 | array( 'src' => 'js/plugins/jquery.namespaceSelect.js', 'version' => 1 ), |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 6 ), |
| 74 | 74 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 21 ), |
| 75 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 33 ), |
| | 75 | + array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 34 ), |
| 76 | 76 | array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 1 ), |
| 77 | 77 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 38 ), |
| 78 | 78 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 9 ), |
| — | — | @@ -81,10 +81,10 @@ |
| 82 | 82 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 0 ), |
| 83 | 83 | ), |
| 84 | 84 | 'combined' => array( |
| 85 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 106 ), |
| | 85 | + array( 'src' => 'js/plugins.combined.js', 'version' => 107 ), |
| 86 | 86 | ), |
| 87 | 87 | 'minified' => array( |
| 88 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 106 ), |
| | 88 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 107 ), |
| 89 | 89 | ), |
| 90 | 90 | ), |
| 91 | 91 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html |
| — | — | @@ -4,7 +4,6 @@ |
| 5 | 5 | <title>WikiEditor</title> |
| 6 | 6 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| 7 | 7 | <script type="text/javascript"> |
| 8 | | - /* |
| 9 | 8 | parent.inherit( window )( function() { |
| 10 | 9 | function get( name ) { |
| 11 | 10 | // Extracts the value of a given URL parameter from the current window location |
| — | — | @@ -17,7 +16,6 @@ |
| 18 | 17 | context.fn.trigger( "change", event ) |
| 19 | 18 | } ); |
| 20 | 19 | } ); |
| 21 | | - */ |
| 22 | 20 | </script> |
| 23 | 21 | </head> |
| 24 | 22 | <body style="margin:0;padding:0;width:100%;height:100%;white-space:pre-wrap;font-family:monospace;font-size:9.5pt;"></body> |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | 'browsers': { |
| 38 | 38 | // Left-to-right languages |
| 39 | 39 | 'ltr': { |
| 40 | | - // The toolbar layout is IE6 |
| | 40 | + // The toolbar layout is broken in IE6 |
| 41 | 41 | 'msie': [['>=', 7]], |
| 42 | 42 | // jQuery UI appears to be broken in FF 2.0 - 2.0.0.4 |
| 43 | 43 | 'firefox': [ |
| — | — | @@ -79,7 +79,7 @@ |
| 80 | 80 | */ |
| 81 | 81 | 'isSupported': function() { |
| 82 | 82 | // Check for and make use of a cached return value |
| 83 | | - if ( $.wikiEditor.supported != undefined ) { |
| | 83 | + if ( typeof $.wikiEditor.supported != 'undefined' ) { |
| 84 | 84 | return $.wikiEditor.supported; |
| 85 | 85 | } |
| 86 | 86 | // Check if we have any compatiblity information on-hand for the current browser |
| — | — | @@ -194,7 +194,7 @@ |
| 195 | 195 | // General place to shouve bits of data into |
| 196 | 196 | 'data': {}, |
| 197 | 197 | // Unique numeric ID of this instance used both for looking up and differentiating instances of wikiEditor |
| 198 | | - 'instance': $.wikiEditor.instances.push( $(this) ) |
| | 198 | + 'instance': $.wikiEditor.instances.push( $(this) ) - 1 |
| 199 | 199 | }; |
| 200 | 200 | |
| 201 | 201 | /* |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -1346,7 +1346,7 @@ |
| 1347 | 1347 | 'browsers': { |
| 1348 | 1348 | // Left-to-right languages |
| 1349 | 1349 | 'ltr': { |
| 1350 | | - // The toolbar layout is IE6 |
| | 1350 | + // The toolbar layout is broken in IE6 |
| 1351 | 1351 | 'msie': [['>=', 7]], |
| 1352 | 1352 | // jQuery UI appears to be broken in FF 2.0 - 2.0.0.4 |
| 1353 | 1353 | 'firefox': [ |
| — | — | @@ -1389,7 +1389,7 @@ |
| 1390 | 1390 | */ |
| 1391 | 1391 | 'isSupported': function() { |
| 1392 | 1392 | // Check for and make use of a cached return value |
| 1393 | | - if ( $.wikiEditor.supported != undefined ) { |
| | 1393 | + if ( typeof $.wikiEditor.supported != 'undefined' ) { |
| 1394 | 1394 | return $.wikiEditor.supported; |
| 1395 | 1395 | } |
| 1396 | 1396 | // Check if we have any compatiblity information on-hand for the current browser |
| — | — | @@ -1504,7 +1504,7 @@ |
| 1505 | 1505 | // General place to shouve bits of data into |
| 1506 | 1506 | 'data': {}, |
| 1507 | 1507 | // Unique numeric ID of this instance used both for looking up and differentiating instances of wikiEditor |
| 1508 | | - 'instance': $.wikiEditor.instances.push( $(this) ) |
| | 1508 | + 'instance': $.wikiEditor.instances.push( $(this) ) - 1 |
| 1509 | 1509 | }; |
| 1510 | 1510 | |
| 1511 | 1511 | /* |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -82,13 +82,13 @@ |
| 83 | 83 | $(this).trigger('scrollToPosition');});}};switch(command){case'encapsulateSelection':options=$.extend({'pre':'','peri':'','post':'','ownline':false,'replace':false},options);break;case'getCaretPosition':options=$.extend({'startAndEnd':false,},options);break;case'setSelection':options=$.extend({'start':undefined,'end':undefined,'startContainer':undefined,'endContainer':undefined,},options);if(options.end===undefined) |
| 84 | 84 | options.end=options.start;if(options.endContainer==undefined) |
| 85 | 85 | options.endContainer=options.startContainer;break;case'scrollToCaretPosition':options=$.extend({'force':false},options);break;} |
| 86 | | -var context=$(this).data('wikiEditor-context');var hasIframe=context!==undefined&&context.$iframe!==undefined;return(hasIframe?context.fn:fn)[command].call(this,options);};})(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/','isSupported':function(){if($.wikiEditor.supported!=undefined){return $.wikiEditor.supported;} |
| | 86 | +var context=$(this).data('wikiEditor-context');var hasIframe=context!==undefined&&context.$iframe!==undefined;return(hasIframe?context.fn:fn)[command].call(this,options);};})(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/','isSupported':function(){if(typeof $.wikiEditor.supported!='undefined'){return $.wikiEditor.supported;} |
| 87 | 87 | if(!($.browser.name in $.wikiEditor.browsers[$('body').is('.rtl')?'rtl':'ltr'])){return $.wikiEditor.supported=true;} |
| 88 | 88 | var browser=$.wikiEditor.browsers[$('body').is('.rtl')?'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 $.wikiEditor.supported=false;}}else if(typeof val=='number'){if(!(eval('$.browser.versionNumber'+op+val))){return $.wikiEditor.supported=false;}}} |
| 89 | 89 | return $.wikiEditor.supported=true;},'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;}}} |
| 90 | 90 | if(property in object){return object[property];}else if(property+'Msg'in object){return gM(object[property+'Msg']);}else{return'';}},'autoLang':function(object,lang){return object[lang||wgUserLanguage]||object['default']||object;},'autoIcon':function(icon,path,lang){var src=$.wikiEditor.autoLang(icon,lang);path=path||$.wikiEditor.imgPath;if(src.substr(0,7)!='http://'&&src.substr(0,8)!='https://'&&src[0]!='/'){src=path+src;} |
| 91 | 91 | return src+'?'+wgWikiEditorIconVersion;}};$.fn.wikiEditor=function(){if(!$j.wikiEditor.isSupported()){return $(this);} |
| 92 | | -var context=$(this).data('wikiEditor-context');if(typeof context=='undefined'){context={'$textarea':$(this),'views':{},'modules':{},'data':{},'instance':$.wikiEditor.instances.push($(this))};context.api={'addModule':function(context,data){var modules={};if(typeof data=='string'){modules[data]={};}else if(typeof data=='object'){modules=data;} |
| | 92 | +var context=$(this).data('wikiEditor-context');if(typeof context=='undefined'){context={'$textarea':$(this),'views':{},'modules':{},'data':{},'instance':$.wikiEditor.instances.push($(this))-1};context.api={'addModule':function(context,data){var modules={};if(typeof data=='string'){modules[data]={};}else if(typeof data=='object'){modules=data;} |
| 93 | 93 | for(module in modules){if(typeof module=='string'&&module in $.wikiEditor.modules){if('api'in $.wikiEditor.modules[module]){for(call in $.wikiEditor.modules[module].api){if(!(call in context.api)){context.api[call]=$.wikiEditor.modules[module].api[call];}}} |
| 94 | 94 | if('fn'in $.wikiEditor.modules[module]&&'create'in $.wikiEditor.modules[module].fn){context.modules[module]={};$.wikiEditor.modules[module].fn.create(context,modules[module]);}}}}};context.evt={'change':function(event){switch(event.type){case'keypress':if(true){event.data.scope='division';}else{event.data.scope='character';} |
| 95 | 95 | break;case'mousedown':if(true){event.data.scope='division';}else{return false;} |