[MediaWiki-CVS] SVN: [54040] trunk/extensions/UsabilityInitiative/js

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54040

Revision: 54040
Author:   catrope
Date:     2009-07-30 19:29:04 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
EditToolbar: Fix bug breaking booklet selection highlighting; using conflicting 
commands in a chained call doesn't work.

Modified Paths:
--------------
    trunk/extensions/UsabilityInitiative/js/jquery.combined.js
    trunk/extensions/UsabilityInitiative/js/jquery.combined.min.js
    trunk/extensions/UsabilityInitiative/js/jquery.toolbar.js

Modified: trunk/extensions/UsabilityInitiative/js/jquery.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/jquery.combined.js  2009-07-30 
19:26:18 UTC (rev 54039)
+++ trunk/extensions/UsabilityInitiative/js/jquery.combined.js  2009-07-30 
19:29:04 UTC (rev 54040)
@@ -5155,9 +5155,8 @@
                                                                        
'div.pages > div.page-' +
                                                                                
$(this).data( 'page' )
                                                                )
-                                                               .show()
-                                                               .end()
-                                                               .addClass( 
'current' );
+                                                               .show();
+                                                       $(this).addClass( 
'current' );
                                                        $.cookie(
                                                                $(this).data( 
'cookie'), $(this).data( 'page' )
                                                        );

Modified: trunk/extensions/UsabilityInitiative/js/jquery.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/jquery.combined.min.js      
2009-07-30 19:26:18 UTC (rev 54039)
+++ trunk/extensions/UsabilityInitiative/js/jquery.combined.min.js      
2009-07-30 19:29:04 UTC (rev 54040)
@@ -493,7 +493,7 @@
 break;case'booklet':if(!('pages'in section)){return;}
 var indexDiv=$('<div></div>').attr('class','index').appendTo($(this));var 
bookletCookie='edittoolbar-'+$(this).attr('id')+'-booklet-'+id;var 
selectedID=$.cookie(bookletCookie);for(page in 
section.pages){if(selectedID===null){selectedID=page;}
 
indexDiv.append($('<div></div>').attr('class',page===selectedID?'current':null).text(msg(section.pages[page],'label')).data('page',page).data('cookie',bookletCookie).click(function(){$(this).parent().parent().find('div.pages
 > 
div.page').hide().end().parent().find('div').removeClass('current').end().parent().parent().find('div.pages
 > div.page-'+
-$(this).data('page')).show().end().addClass('current');$.cookie($(this).data('cookie'),$(this).data('page'));}));}
+$(this).data('page')).show();$(this).addClass('current');$.cookie($(this).data('cookie'),$(this).data('page'));}));}
 var pagesDiv=$('<div></div>').attr('class','pages').appendTo($(this));for(page 
in section.pages){var pageDiv=$('<div></div>').attr('class','page 
page-'+page).css('display',page===selectedID?'block':'none').appendTo(pagesDiv);switch(section.pages[page].layout){case'table':var
 
contentTable=$('<table></table>').attr({'cellpadding':'0','cellspacing':'0','border':'0','width':'100%'}).appendTo(pageDiv);var
 headingRow=$('<tr></tr>').appendTo(contentTable);for(heading in 
section.pages[page].headings){$('<th></th>').text(msg(section.pages[page].headings[heading],'content')).appendTo(headingRow);}
 for(row in section.pages[page].rows){var 
contentRow=$('<tr></tr>').appendTo(contentTable);for(cell in 
section.pages[page].rows[row]){$('<td></td>').attr({'class':cell,'valign':'top'}).append($('<span></span>').text(msg(section.pages[page].rows[row][cell],'content'))).appendTo(contentRow);}}
 break;case'characters':var charsDiv=$('<div 
/>').attr(section.pages[page].attributes).css(section.pages[page].styles).appendTo(pageDiv);for(character
 in 
section.pages[page].characters){switch(section.pages[page].characters[character].type){case'link':var
 
context={'tool':section.pages[page].characters[character],'textbox':textbox};charsDiv.append($('<a
 
/>').attr('href','#').text(section.pages[page].characters[character].label).data('context',context).click(action).click(function(){return
 false;}));break;}}

Modified: trunk/extensions/UsabilityInitiative/js/jquery.toolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/jquery.toolbar.js   2009-07-30 
19:26:18 UTC (rev 54039)
+++ trunk/extensions/UsabilityInitiative/js/jquery.toolbar.js   2009-07-30 
19:29:04 UTC (rev 54040)
@@ -248,9 +248,8 @@
                                                                        
'div.pages > div.page-' +
                                                                                
$(this).data( 'page' )
                                                                )
-                                                               .show()
-                                                               .end()
-                                                               .addClass( 
'current' );
+                                                               .show();
+                                                       $(this).addClass( 
'current' );
                                                        $.cookie(
                                                                $(this).data( 
'cookie'), $(this).data( 'page' )
                                                        );



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@xxxxxxxxxxxxxxxxxxx
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs