http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56205
Revision: 56205
Author: catrope
Date: 2009-09-11 19:27:05 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
NavigableTOC: (bug 20598) Fix indentation error
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-09-11 18:52:00 UTC (rev 56204)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2009-09-11 19:27:05 UTC (rev 56205)
@@ -65,14 +65,14 @@
array( 'src' =>
'js/plugins/jquery.wikiEditor.js', 'version' => 4 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 11 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 2 ),
- array( 'src' =>
'js/plugins/jquery.wikiEditor.toc.js', 'version' => 7 ),
+ array( 'src' =>
'js/plugins/jquery.wikiEditor.toc.js', 'version' => 8 ),
array( 'src' => 'js/js2/jquery-ui-1.7.2.js',
'version' => '1.7.2x' ),
),
'combined' => array(
- array( 'src' => 'js/plugins.combined.js',
'version' => 18 ),
+ array( 'src' => 'js/plugins.combined.js',
'version' => 19 ),
),
'minified' => array(
- array( 'src' => 'js/plugins.combined.min.js',
'version' => 18 ),
+ array( 'src' => 'js/plugins.combined.min.js',
'version' => 19 ),
),
),
);
Modified:
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
2009-09-11 18:52:00 UTC (rev 56204)
+++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
2009-09-11 19:27:05 UTC (rev 56205)
@@ -207,7 +207,7 @@
if ( outline[i].level > lastLevel ) {
nLevel++;
}
- else if ( outline[i].level < nLevel ) {
+ else if ( outline[i].level < lastLevel ) {
nLevel -= Math.max( 1, lastLevel -
outline[i].level );
}
if ( nLevel <= 0 ) {
@@ -227,4 +227,4 @@
}
}
-}; } ) ( jQuery );
\ No newline at end of file
+}; } ) ( jQuery );
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2009-09-11
18:52:00 UTC (rev 56204)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2009-09-11
19:27:05 UTC (rev 56205)
@@ -2001,7 +2001,7 @@
if ( outline[i].level > lastLevel ) {
nLevel++;
}
- else if ( outline[i].level < nLevel ) {
+ else if ( outline[i].level < lastLevel ) {
nLevel -= Math.max( 1, lastLevel -
outline[i].level );
}
if ( nLevel <= 0 ) {
@@ -2021,4 +2021,4 @@
}
}
-}; } ) ( jQuery );
\ No newline at end of file
+}; } ) ( jQuery );
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2009-09-11 18:52:00 UTC (rev 56204)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2009-09-11 19:27:05 UTC (rev 56205)
@@ -137,7 +137,7 @@
var endLevel=0;for(var
c=text.length-1;c>=0;c--){if(text.charAt(c)=='='){endLevel++;}else{break;}}
var
level=Math.min(startLevel,endLevel);text=$.trim(text.substr(level,text.length-(level*2)));outline[h]={'text':text,'position':position,'level':level,'index':h+1};}
var lastLevel=0;var nLevel=0;for(var
i=0;i<outline.length;i++){if(outline[i].level>lastLevel){nLevel++;}
-else
if(outline[i].level<nLevel){nLevel-=Math.max(1,lastLevel-outline[i].level);}
+else
if(outline[i].level<lastLevel){nLevel-=Math.max(1,lastLevel-outline[i].level);}
if(nLevel<=0){nLevel=1;}
outline[i].nLevel=nLevel;lastLevel=outline[i].level;}
var structure=buildStructure(outline);if($('input[name=wpSection]').val()=='')
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
