| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -70,15 +70,15 @@ |
| 71 | 71 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 6 ), |
| 72 | 72 | array( 'src' => 'js/plugins/jquery.textSelection.js', 'version' => 16 ), |
| 73 | 73 | array( 'src' => 'js/plugins/jquery.wikiEditor.js', 'version' => 12 ), |
| 74 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 16 ), |
| | 74 | + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 17 ), |
| 75 | 75 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 6 ), |
| 76 | 76 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 22 ), |
| 77 | 77 | ), |
| 78 | 78 | 'combined' => array( |
| 79 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 51 ), |
| | 79 | + array( 'src' => 'js/plugins.combined.js', 'version' => 52 ), |
| 80 | 80 | ), |
| 81 | 81 | 'minified' => array( |
| 82 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 51 ), |
| | 82 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 52 ), |
| 83 | 83 | ), |
| 84 | 84 | ), |
| 85 | 85 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js |
| — | — | @@ -488,8 +488,8 @@ |
| 489 | 489 | 'wikiEditor-' + $(this).data( 'context' ).instance + '-toolbar-section', |
| 490 | 490 | show ? $section.attr( 'rel' ) : null |
| 491 | 491 | ); |
| 492 | | - return false; |
| 493 | 492 | } ) |
| | 493 | + .click( function() { return false; } ) |
| 494 | 494 | ); |
| 495 | 495 | }, |
| 496 | 496 | buildSection : function( context, id, section ) { |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -2118,8 +2118,8 @@ |
| 2119 | 2119 | 'wikiEditor-' + $(this).data( 'context' ).instance + '-toolbar-section', |
| 2120 | 2120 | show ? $section.attr( 'rel' ) : null |
| 2121 | 2121 | ); |
| 2122 | | - return false; |
| 2123 | 2122 | } ) |
| | 2123 | + .click( function() { return false; } ) |
| 2124 | 2124 | ); |
| 2125 | 2125 | }, |
| 2126 | 2126 | buildSection : function( context, id, section ) { |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -134,7 +134,7 @@ |
| 135 | 135 | 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]}}};} |
| 136 | 136 | if('action'in character&&'label'in character){actions[character.label]=character.action;return'<a rel="'+character.label+'" href="#">'+character.label+'</a>';}},buildTab:function(context,id,section){var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');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).bind('mousedown',function(){var $sections=$(this).data('context').$ui.find('.sections');var $section=$(this).data('context').$ui.find('.section-'+$(this).parent().attr('rel'));$(this).blur();var show=$section.css('display')=='none';$previousSections=$section.parent().find('.section:visible');$previousSections.css('position','absolute');$previousSections.fadeOut('fast',function(){$(this).css('position','relative');});$(this).parent().parent().find('a').removeClass('current');$sections.css('overflow','hidden');if(show){$section.fadeIn('fast');$sections.animate({'height':$section.outerHeight()},$section.outerHeight()*2,function(){$(this).css('overflow','visible').css('height','auto');});$(this).addClass('current');}else{$sections.css('height',$section.outerHeight()).animate({'height':0},$section.outerHeight()*2,function(){$(this).css('overflow','visible');});} |
| 137 | 137 | if($.trackAction!=undefined){$.trackAction($section.attr('rel')+'.'+(show?'show':'hide'));} |
| 138 | | -$.cookie('wikiEditor-'+$(this).data('context').instance+'-toolbar-section',show?$section.attr('rel'):null);return false;}));},buildSection:function(context,id,section){context.$textarea.trigger('wikiEditor-toolbar-buildSection-'+id,[section]);var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');var $section;switch(section.type){case'toolbar':var $section=$('<div />').attr({'class':'toolbar section section-'+id,'rel':id});if('groups'in section){for(group in section.groups){$section.append($.wikiEditor.modules.toolbar.fn.buildGroup(context,group,section.groups[group]));}} |
| | 138 | +$.cookie('wikiEditor-'+$(this).data('context').instance+'-toolbar-section',show?$section.attr('rel'):null);}).click(function(){return false;}));},buildSection:function(context,id,section){context.$textarea.trigger('wikiEditor-toolbar-buildSection-'+id,[section]);var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');var $section;switch(section.type){case'toolbar':var $section=$('<div />').attr({'class':'toolbar section section-'+id,'rel':id});if('groups'in section){for(group in section.groups){$section.append($.wikiEditor.modules.toolbar.fn.buildGroup(context,group,section.groups[group]));}} |
| 139 | 139 | break;case'booklet':var $pages=$('<div />').addClass('pages');var $index=$('<div />').addClass('index');if('pages'in section){for(page in section.pages){$pages.append($.wikiEditor.modules.toolbar.fn.buildPage(context,page,section.pages[page]));$index.append($.wikiEditor.modules.toolbar.fn.buildBookmark(context,page,section.pages[page]));}} |
| 140 | 140 | $section=$('<div />').attr({'class':'booklet section section-'+id,'rel':id}).append($index).append($pages);$.wikiEditor.modules.toolbar.fn.updateBookletSelection(context,page,$pages,$index);break;} |
| 141 | 141 | if($section!==null&&id!=='main'){var show=selected==id;$section.css('display',show?'block':'none');} |