r57430 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r57429‎ | r57430 | r57431 >
Date:19:11, 6 October 2009
Author:tparscal
Status:ok
Tags:
Comment:
Some layout fixes for IE on the table of contents. Also replaced the shell script with a propper Makefile and regenerated all the combined and minified styles and scripts.
Modified paths:
  • /trunk/extensions/UsabilityInitiative/Makefile (added) (history)
  • /trunk/extensions/UsabilityInitiative/combine.sh (deleted) (history)
  • /trunk/extensions/UsabilityInitiative/css/combined.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/combined.min.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/wikiEditor.toc.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/js/plugins.combined.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/combine.sh
——@@ -1,15 +0,0 @@
2 -echo "Removing combined scripts and styles"
3 -rm js/js2.combined.*
4 -rm js/plugins.combined.*
5 -rm css/combined.*
6 -echo "Merging raw scripts and styles"
7 -# Explicitly including scripts is important, because loading order is important
8 -cat js/js2/jquery-1.3.2.js js/js2/jquery-ui-1.7.2.js js/js2/js2.js > js/js2.combined.js
9 -cat js/plugins/jquery.async.js js/plugins/jquery.autoEllipse.js js/plugins/jquery.browser.js js/plugins/jquery.cookie.js js/plugins/jquery.delayedBind.js js/plugins/jquery.namespaceSelect.js js/plugins/jquery.suggestions.js js/plugins/jquery.textSelection.js js/plugins/jquery.wikiEditor.js js/plugins/jquery.wikiEditor.dialogs.js js/plugins/jquery.wikiEditor.toolbar.js js/plugins/jquery.wikiEditor.toc.js > js/plugins.combined.js
10 -# Styles can be loaded in any order
11 -cat css/*.css > css/combined.css
12 -# For more info on JSMin, see: http://www.crockford.com/javascript/jsmin.html
13 -echo "Minifying merged scripts and styles"
14 -jsmin < js/js2.combined.js > js/js2.combined.min.js
15 -jsmin < js/plugins.combined.js > js/plugins.combined.min.js
16 -cat css/combined.css | sed -e 's/^[ ]*//g; s/[ ]*$//g; s/\([:{;,]\) /\1/g; s/ {/{/g; s/\/\*.*\*\///g; /^$/d' >css/combined.min.css
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.toc.css
——@@ -12,6 +12,7 @@
1313 float: right;
1414 padding: 0;
1515 overflow: auto;
 16+ overflow-x: hidden;
1617 }
1718 body.rtl .wikiEditor-ui-toc {
1819 right: auto;
Index: trunk/extensions/UsabilityInitiative/css/combined.css
——@@ -117,6 +117,7 @@
118118 float: right;
119119 padding: 0;
120120 overflow: auto;
 121+ overflow-x: hidden;
121122 }
122123 body.rtl .wikiEditor-ui-toc {
123124 right: auto;
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css
——@@ -105,6 +105,7 @@
106106 float:right;
107107 padding:0;
108108 overflow:auto;
 109+overflow-x:hidden;
109110 }
110111 body.rtl .wikiEditor-ui-toc{
111112 right:auto;
——@@ -456,4 +457,4 @@
457458 background-color:white;
458459 text-decoration:none;
459460 border-color:#a8d7f9;
460 -}
\ No newline at end of file
 461+}
Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
——@@ -237,6 +237,8 @@
238238 structure.unshift( { 'text': wgPageName.replace(/_/g, ' '), 'level': 1, 'index': 0, 'position': 0 } );
239239 context.modules.$toc.html( buildList( structure ) );
240240
 241+ context.modules.$toc.find( 'ul' ).css( 'width', '10em' );
 242+
241243 var links = context.modules.$toc.find( 'ul a' );
242244 // Highlighted links are wider; autoEllipse links in
243245 // highlighted state
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js
——@@ -2280,6 +2280,8 @@
22812281 structure.unshift( { 'text': wgPageName.replace(/_/g, ' '), 'level': 1, 'index': 0, 'position': 0 } );
22822282 context.modules.$toc.html( buildList( structure ) );
22832283
 2284+ context.modules.$toc.find( 'ul' ).css( 'width', '10em' );
 2285+
22842286 var links = context.modules.$toc.find( 'ul a' );
22852287 // Highlighted links are wider; autoEllipse links in
22862288 // highlighted state
Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
——@@ -159,4 +159,4 @@
160160 if(nLevel<=0){nLevel=1;}
161161 outline[i].nLevel=nLevel;lastLevel=outline[i].level;}
162162 var structure=buildStructure(outline);if($('input[name=wpSection]').val()=='')
163 -structure.unshift({'text':wgPageName.replace(/_/g,' '),'level':1,'index':0,'position':0});context.modules.$toc.html(buildList(structure));var links=context.modules.$toc.find('ul a');links.addClass('currentSelection');links.autoEllipse({'position':'right','tooltip':true});links.removeClass('currentSelection');context.data.outline=outline;}}};})(jQuery);
\ No newline at end of file
 163+structure.unshift({'text':wgPageName.replace(/_/g,' '),'level':1,'index':0,'position':0});context.modules.$toc.html(buildList(structure));context.modules.$toc.find('ul').css('width','10em');var links=context.modules.$toc.find('ul a');links.addClass('currentSelection');links.autoEllipse({'position':'right','tooltip':true});links.removeClass('currentSelection');context.data.outline=outline;}}};})(jQuery);
\ No newline at end of file
Index: trunk/extensions/UsabilityInitiative/Makefile
——@@ -0,0 +1,54 @@
 2+#
 3+# Handy makefile to combine and minify css and javascript files
 4+#
 5+# For more info on JSMin, see: http://www.crockford.com/javascript/jsmin.html
 6+#
 7+
 8+all: css/combined.css\
 9+ css/combined.min.css\
 10+ js/js2.combined.js\
 11+ js/js2.combined.min.js\
 12+ js/plugins.combined.js\
 13+ js/plugins.combined.min.js
 14+
 15+css/combined.css:
 16+ cat css/*.css > css/combined.css
 17+
 18+js/js2.combined.js:
 19+ cat\
 20+ js/js2/jquery-1.3.2.js\
 21+ js/js2/jquery-ui-1.7.2.js\
 22+ js/js2/js2.js\
 23+ > js/js2.combined.js
 24+
 25+js/plugins.combined.js:
 26+ cat\
 27+ js/plugins/jquery.async.js\
 28+ js/plugins/jquery.autoEllipse.js\
 29+ js/plugins/jquery.browser.js\
 30+ js/plugins/jquery.cookie.js\
 31+ js/plugins/jquery.delayedBind.js\
 32+ js/plugins/jquery.namespaceSelect.js\
 33+ js/plugins/jquery.suggestions.js\
 34+ js/plugins/jquery.textSelection.js\
 35+ js/plugins/jquery.wikiEditor.js\
 36+ js/plugins/jquery.wikiEditor.dialogs.js\
 37+ js/plugins/jquery.wikiEditor.toolbar.js\
 38+ js/plugins/jquery.wikiEditor.toc.js\
 39+ > js/plugins.combined.js
 40+
 41+js/js2.combined.min.js : js/js2.combined.js
 42+ jsmin < js/js2.combined.js > js/js2.combined.min.js
 43+
 44+js/plugins.combined.min.js : js/plugins.combined.js
 45+ jsmin < js/plugins.combined.js > js/plugins.combined.min.js
 46+
 47+css/combined.min.css : css/combined.css
 48+ cat css/combined.css |\
 49+ sed -e 's/^[ ]*//g; s/[ ]*$$//g; s/\([:{;,]\) /\1/g; s/ {/{/g; s/\/\*.*\*\///g; /^$$/d'\
 50+ > css/combined.min.css
 51+
 52+clean:
 53+ rm -f js/js2.combined.*
 54+ rm -f js/plugins.combined.*
 55+ rm -f css/combined.*

Follow-up revisions

RevisionCommit summaryAuthorDate
r57719wmf-deployment: Merge babaco fixes from trunk...catrope20:20, 14 October 2009

Status & tagging log