Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
— | — | @@ -72,8 +72,8 @@ |
73 | 73 | array( 'src' => 'js/plugins/jquery.delayedBind.js', 'version' => 1 ), |
74 | 74 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 7 ), |
75 | 75 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 27 ), |
76 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 178 ), |
77 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 51 ), |
| 76 | + array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 179 ), |
| 77 | + array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 52 ), |
78 | 78 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 54 ), |
79 | 79 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 23 ), |
80 | 80 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 98 ), |
— | — | @@ -82,10 +82,10 @@ |
83 | 83 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ), |
84 | 84 | ), |
85 | 85 | 'combined' => array( |
86 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 366 ), |
| 86 | + array( 'src' => 'js/plugins.combined.js', 'version' => 367 ), |
87 | 87 | ), |
88 | 88 | 'minified' => array( |
89 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 366 ), |
| 89 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 367 ), |
90 | 90 | ), |
91 | 91 | ), |
92 | 92 | ); |
Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js |
— | — | @@ -365,7 +365,7 @@ |
366 | 366 | } |
367 | 367 | break; |
368 | 368 | case 86: //v |
369 | | - if ( event.ctrlKey ){ |
| 369 | + if ( event.ctrlKey && $.browser.msie){ |
370 | 370 | //paste, intercepted for IE |
371 | 371 | context.evt.paste( event ); |
372 | 372 | } |
— | — | @@ -419,7 +419,6 @@ |
420 | 420 | // Save the cursor position to restore it after all this voodoo |
421 | 421 | var cursorPos = context.fn.getCaretPosition(); |
422 | 422 | var oldLength = context.fn.getContents().length; |
423 | | - |
424 | 423 | context.$content.find( ':not(.wikiEditor)' ).addClass( 'wikiEditor' ); |
425 | 424 | if ( $.layout.name !== 'webkit' ) { |
426 | 425 | context.$content.addClass( 'pasting' ); |
Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.highlight.js |
— | — | @@ -414,7 +414,7 @@ |
415 | 415 | |
416 | 416 | // Remove this marker |
417 | 417 | var marker = $(this).data( 'marker' ); |
418 | | - if ( typeof marker.skipDivision != 'undefined' && ( division == marker.skipDivision ) ) { |
| 418 | + if ( marker && typeof marker.skipDivision != 'undefined' && ( division == marker.skipDivision ) ) { |
419 | 419 | // Don't remove these either |
420 | 420 | return true; |
421 | 421 | } |
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
— | — | @@ -6908,7 +6908,7 @@ |
6909 | 6909 | } |
6910 | 6910 | break; |
6911 | 6911 | case 86: //v |
6912 | | - if ( event.ctrlKey ){ |
| 6912 | + if ( event.ctrlKey && $.browser.msie){ |
6913 | 6913 | //paste, intercepted for IE |
6914 | 6914 | context.evt.paste( event ); |
6915 | 6915 | } |
— | — | @@ -6962,7 +6962,6 @@ |
6963 | 6963 | // Save the cursor position to restore it after all this voodoo |
6964 | 6964 | var cursorPos = context.fn.getCaretPosition(); |
6965 | 6965 | var oldLength = context.fn.getContents().length; |
6966 | | - |
6967 | 6966 | context.$content.find( ':not(.wikiEditor)' ).addClass( 'wikiEditor' ); |
6968 | 6967 | if ( $.layout.name !== 'webkit' ) { |
6969 | 6968 | context.$content.addClass( 'pasting' ); |
— | — | @@ -8976,7 +8975,7 @@ |
8977 | 8976 | |
8978 | 8977 | // Remove this marker |
8979 | 8978 | var marker = $(this).data( 'marker' ); |
8980 | | - if ( typeof marker.skipDivision != 'undefined' && ( division == marker.skipDivision ) ) { |
| 8979 | + if ( marker && typeof marker.skipDivision != 'undefined' && ( division == marker.skipDivision ) ) { |
8981 | 8980 | // Don't remove these either |
8982 | 8981 | return true; |
8983 | 8982 | } |
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
— | — | @@ -458,7 +458,7 @@ |
459 | 459 | return false;} |
460 | 460 | break;case 9:if(event.ctrlKey||event.altKey||event.shiftKey){return true;}else{var $tabindexList=$j('[tabindex]:visible').sort(function(a,b){return a.tabIndex-b.tabIndex;});for(var i=0;i<$tabindexList.length;i++){if($tabindexList.eq(i).attr('id')==context.$iframe.attr('id')){$tabindexList.get(i+1).focus();break;}} |
461 | 461 | return false;} |
462 | | -break;case 86:if(event.ctrlKey){context.evt.paste(event);} |
| 462 | +break;case 86:if(event.ctrlKey&&$.browser.msie){context.evt.paste(event);} |
463 | 463 | break;} |
464 | 464 | return true;},'change':function(event){event.data.scope='division';var newHTML=context.$content.html();if(context.oldHTML!=newHTML){context.fn.purgeOffsets();context.oldHTML=newHTML;event.data.scope='realchange';} |
465 | 465 | if(context.$content.children().length==0){context.$content.append('<p></p>');} |
— | — | @@ -613,7 +613,7 @@ |
614 | 614 | $(anchor).data('marker',markers[i]).addClass('wikiEditor-highlight');markers[i].afterWrap(anchor,markers[i]);}else{$(anchor).data('marker',markers[i]);markers[i].onSkip(anchor);} |
615 | 615 | visited[v++]=anchor;}} |
616 | 616 | var j=0;context.$content.find('.wikiEditor-highlight').each(function(){if(visited[j]==this){j++;return true;} |
617 | | -var marker=$(this).data('marker');if(typeof marker.skipDivision!='undefined'&&(division==marker.skipDivision)){return true;} |
| 617 | +var marker=$(this).data('marker');if(marker&&typeof marker.skipDivision!='undefined'&&(division==marker.skipDivision)){return true;} |
618 | 618 | if(marker&&typeof marker.beforeUnwrap=='function') |
619 | 619 | marker.beforeUnwrap(this);if((marker&&marker.anchor=='tag')||$(this).is('p')){$(this).removeAttr('class');}else{$(this).replaceWith(this.childNodes);} |
620 | 620 | context.fn.purgeOffsets();});}}};})(jQuery);(function($){$.wikiEditor.modules.preview={'browsers':{'ltr':{'msie':[['>=',7]],'firefox':[['>=',3]],'opera':[['>=',9.6]],'safari':[['>=',4]]},'rtl':{'msie':[['>=',8]],'firefox':[['>=',3]],'opera':[['>=',9.6]],'safari':[['>=',4]]}},fn:{create:function(context,config){if('initialized'in context.modules.preview){return;} |