| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 34 ), |
| 79 | 79 | array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 191 ), |
| 80 | 80 | array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ), |
| 81 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 65 ), |
| | 81 | + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 66 ), |
| 82 | 82 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 25 ), |
| 83 | 83 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 98 ), |
| 84 | 84 | array( 'src' => 'js/plugins/jquery.wikiEditor.preview.js', 'version' => 11 ), |
| — | — | @@ -89,10 +89,10 @@ |
| 90 | 90 | array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 1 ), |
| 91 | 91 | ), |
| 92 | 92 | 'combined' => array( |
| 93 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 418 ), |
| | 93 | + array( 'src' => 'js/plugins.combined.js', 'version' => 419 ), |
| 94 | 94 | ), |
| 95 | 95 | 'minified' => array( |
| 96 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 418 ), |
| | 96 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 419 ), |
| 97 | 97 | ), |
| 98 | 98 | ), |
| 99 | 99 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js |
| — | — | @@ -540,9 +540,9 @@ |
| 541 | 541 | character = { |
| 542 | 542 | 'label' : character, |
| 543 | 543 | 'action' : { |
| 544 | | - 'type' : 'encapsulate', |
| | 544 | + 'type' : 'replace', |
| 545 | 545 | 'options' : { |
| 546 | | - 'pre' : character |
| | 546 | + 'peri' : character |
| 547 | 547 | } |
| 548 | 548 | } |
| 549 | 549 | }; |
| — | — | @@ -550,9 +550,9 @@ |
| 551 | 551 | character = { |
| 552 | 552 | 'label' : character[0], |
| 553 | 553 | 'action' : { |
| 554 | | - 'type' : 'encapsulate', |
| | 554 | + 'type' : 'replace', |
| 555 | 555 | 'options' : { |
| 556 | | - 'pre' : character[1] |
| | 556 | + 'peri' : character[1] |
| 557 | 557 | } |
| 558 | 558 | } |
| 559 | 559 | }; |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -11634,9 +11634,9 @@ |
| 11635 | 11635 | character = { |
| 11636 | 11636 | 'label' : character, |
| 11637 | 11637 | 'action' : { |
| 11638 | | - 'type' : 'encapsulate', |
| | 11638 | + 'type' : 'replace', |
| 11639 | 11639 | 'options' : { |
| 11640 | | - 'pre' : character |
| | 11640 | + 'peri' : character |
| 11641 | 11641 | } |
| 11642 | 11642 | } |
| 11643 | 11643 | }; |
| — | — | @@ -11644,9 +11644,9 @@ |
| 11645 | 11645 | character = { |
| 11646 | 11646 | 'label' : character[0], |
| 11647 | 11647 | 'action' : { |
| 11648 | | - 'type' : 'encapsulate', |
| | 11648 | + 'type' : 'replace', |
| 11649 | 11649 | 'options' : { |
| 11650 | | - 'pre' : character[1] |
| | 11650 | + 'peri' : character[1] |
| 11651 | 11651 | } |
| 11652 | 11652 | } |
| 11653 | 11653 | }; |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -796,7 +796,7 @@ |
| 797 | 797 | return $page;},buildHeading:function(context,headings){var html='<tr>';for(heading in headings){html+='<th>'+$.wikiEditor.autoMsg(headings[heading],['html','text'])+'</th>';} |
| 798 | 798 | return html;},buildRow:function(context,row){var html='<tr>';for(cell in row){html+='<td class="cell cell-'+cell+'" valign="top"><span>'+ |
| 799 | 799 | $.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';} |
| 800 | | -html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'encapsulate','options':{'pre':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'encapsulate','options':{'pre':character[1]}}};} |
| | 800 | +html+='</tr>';return html;},buildCharacter:function(character,actions){if(typeof character=='string'){character={'label':character,'action':{'type':'replace','options':{'peri':character}}};}else if(0 in character&&1 in character){character={'label':character[0],'action':{'type':'replace','options':{'peri':character[1]}}};} |
| 801 | 801 | if('action'in character&&'label'in character){actions[character.label]=character.action;return'<span rel="'+character.label+'">'+character.label+'</span>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');if(selected!=null){$.cookie('wikiEditor-'+context.instance+'-toolbar-section',selected,{expires:30,path:'/'});} |
| 802 | 802 | return $('<span />').attr({'class':'tab tab-'+id,'rel':id}).append($('<a />').addClass(selected==id?'current':null).attr('href','#').text($.wikiEditor.autoMsg(section,'label')).data('context',context).mouseup(function(e){$(this).blur();}).mousedown(function(e){e.preventDefault();return false;}).click(function(e){var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section-visible');$previousSections.css('position','absolute');$previousSections.removeClass('section-visible');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');function animate($this){$sections.css('display','block').animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$this.css('overflow','visible').css('height','auto');context.fn.trigger('resize');});} |
| 803 | 803 | if(show){$section.addClass('section-visible');$section.fadeIn('fast');if($section.hasClass('loading')){$this=$(this);$this.addClass('current loading');setTimeout(function(){$section.trigger('loadSection');animate($(this));$this.removeClass('loading');},1000);}else{animate($(this));$(this).addClass('current');}}else{$sections.css('height',$section.outerHeight()).animate({'height':'hide'},$section.outerHeight()*2,function(){$(this).css({'overflow':'visible','height':0});context.fn.trigger('resize');});} |