| Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.toolbar.css |
| — | — | @@ -11,7 +11,6 @@ |
| 12 | 12 | width: 100%; |
| 13 | 13 | clear: both; |
| 14 | 14 | height: 0; |
| 15 | | - overflow: hidden; |
| 16 | 15 | } |
| 17 | 16 | body.rtl .wikiEditor-ui-toolbar .sections { |
| 18 | 17 | float: right; |
| Index: trunk/extensions/UsabilityInitiative/css/combined.css |
| — | — | @@ -191,7 +191,6 @@ |
| 192 | 192 | width: 100%; |
| 193 | 193 | clear: both; |
| 194 | 194 | height: 0; |
| 195 | | - overflow: hidden; |
| 196 | 195 | } |
| 197 | 196 | body.rtl .wikiEditor-ui-toolbar .sections { |
| 198 | 197 | float: right; |
| Index: trunk/extensions/UsabilityInitiative/css/combined.min.css |
| — | — | @@ -175,7 +175,6 @@ |
| 176 | 176 | width:100%; |
| 177 | 177 | clear:both; |
| 178 | 178 | height:0; |
| 179 | | -overflow:hidden; |
| 180 | 179 | } |
| 181 | 180 | body.rtl .wikiEditor-ui-toolbar .sections{ |
| 182 | 181 | float:right; |
| Index: trunk/extensions/UsabilityInitiative/CollapsibleTabs/CollapsibleTabs.js |
| — | — | @@ -11,7 +11,6 @@ |
| 12 | 12 | var target = $moving.data('collapsibleTabsSettings').collapsedContainer; |
| 13 | 13 | $moving.css("position", "relative").css( ( rtl ? 'left' : 'right'), 0 ); |
| 14 | 14 | $moving.animate({width: '1px'},"normal",function(){ |
| 15 | | - //$j(this).remove().prependTo(target).data('collapsibleTabsSettings', data).show(); |
| 16 | 15 | $j(this).hide(); |
| 17 | 16 | // add the placeholder |
| 18 | 17 | $j('<span class="placeholder" style="display:none;"></span>').insertAfter(this); |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -20,17 +20,17 @@ |
| 21 | 21 | 'raw' => array( |
| 22 | 22 | array( 'src' => 'css/suggestions.css', 'version' => 6 ), |
| 23 | 23 | array( 'src' => 'css/wikiEditor.css', 'version' => 4 ), |
| 24 | | - array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 6 ), |
| | 24 | + array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 7 ), |
| 25 | 25 | array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 2 ), |
| 26 | 26 | array( 'src' => 'css/wikiEditor.toc.css', 'version' => 6 ), |
| 27 | 27 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2' ), |
| 28 | 28 | ), |
| 29 | 29 | 'combined' => array( |
| 30 | | - array( 'src' => 'css/combined.css', 'version' => 11 ), |
| | 30 | + array( 'src' => 'css/combined.css', 'version' => 12 ), |
| 31 | 31 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2' ), |
| 32 | 32 | ), |
| 33 | 33 | 'minified' => array( |
| 34 | | - array( 'src' => 'css/combined.min.css', 'version' => 11 ), |
| | 34 | + array( 'src' => 'css/combined.min.css', 'version' => 12 ), |
| 35 | 35 | array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2' ), |
| 36 | 36 | ), |
| 37 | 37 | ) |
| — | — | @@ -70,7 +70,7 @@ |
| 71 | 71 | array( 'src' => 'js/plugins/jquery.suggestions.js', 'version' => 5 ), |
| 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' => 12 ), |
| | 74 | + array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 13 ), |
| 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 | ), |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js |
| — | — | @@ -459,12 +459,13 @@ |
| 460 | 460 | $previousSections.css( 'position', 'absolute' ); |
| 461 | 461 | $previousSections.fadeOut( 'fast', function() { $(this).css( 'position', 'relative' ); } ); |
| 462 | 462 | $(this).parent().parent().find( 'a' ).removeClass( 'current' ); |
| | 463 | + $sections.css('overflow', 'hidden'); |
| 463 | 464 | if ( show ) { |
| 464 | 465 | $section.fadeIn( 'fast' ); |
| 465 | | - $sections.animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2 ); |
| | 466 | + $sections.animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() { $(this).css('overflow', 'visible'); } ); |
| 466 | 467 | $(this).addClass( 'current' ); |
| 467 | 468 | } else { |
| 468 | | - $sections.animate( { 'height': 0 }, $section.outerHeight() * 2 ); |
| | 469 | + $sections.animate( { 'height': 0 }, $section.outerHeight() * 2, function() { $(this).css('overflow', 'visible'); } ); |
| 469 | 470 | } |
| 470 | 471 | // Click tracking |
| 471 | 472 | if($.trackAction != undefined){ |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -2083,12 +2083,13 @@ |
| 2084 | 2084 | $previousSections.css( 'position', 'absolute' ); |
| 2085 | 2085 | $previousSections.fadeOut( 'fast', function() { $(this).css( 'position', 'relative' ); } ); |
| 2086 | 2086 | $(this).parent().parent().find( 'a' ).removeClass( 'current' ); |
| | 2087 | + $sections.css('overflow', 'hidden'); |
| 2087 | 2088 | if ( show ) { |
| 2088 | 2089 | $section.fadeIn( 'fast' ); |
| 2089 | | - $sections.animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2 ); |
| | 2090 | + $sections.animate( { 'height': $section.outerHeight() }, $section.outerHeight() * 2, function() { $(this).css('overflow', 'visible'); } ); |
| 2090 | 2091 | $(this).addClass( 'current' ); |
| 2091 | 2092 | } else { |
| 2092 | | - $sections.animate( { 'height': 0 }, $section.outerHeight() * 2 ); |
| | 2093 | + $sections.animate( { 'height': 0 }, $section.outerHeight() * 2, function() { $(this).css('overflow', 'visible'); } ); |
| 2093 | 2094 | } |
| 2094 | 2095 | // Click tracking |
| 2095 | 2096 | if($.trackAction != undefined){ |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -131,7 +131,7 @@ |
| 132 | 132 | return html;},buildRow:function(context,row){var html='<tr>';for(cell in row){html+='<td class="cell cell-'+cell+'" valign="top"><span>'+ |
| 133 | 133 | $.wikiEditor.autoMsg(row[cell],['html','text'])+'</span></td>';} |
| 134 | 134 | 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]}}};} |
| 135 | | -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');if(show){$section.fadeIn('fast');$sections.animate({'height':$section.outerHeight()},$section.outerHeight()*2);$(this).addClass('current');}else{$sections.animate({'height':0},$section.outerHeight()*2);} |
| | 135 | +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');});$(this).addClass('current');}else{$sections.animate({'height':0},$section.outerHeight()*2,function(){$(this).css('overflow','visible');});} |
| 136 | 136 | if($.trackAction!=undefined){$.trackAction($section.attr('rel')+'.'+(show?'show':'hide'));} |
| 137 | 137 | $.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 | 138 | 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]));}} |