| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -75,16 +75,16 @@ |
| 76 | 76 | array( 'src' => 'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 3 ), |
| 77 | 77 | array( 'src' => 'js/plugins/jquery.wikiEditor.toolbar.js', 'version' => 40 ), |
| 78 | 78 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 10 ), |
| 79 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 52 ), |
| | 79 | + array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 53 ), |
| 80 | 80 | array( 'src' => 'js/plugins/jquery.wikiEditor.preview.js', 'version' => 8 ), |
| 81 | 81 | array( 'src' => 'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 3 ), |
| 82 | 82 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 1 ), |
| 83 | 83 | ), |
| 84 | 84 | 'combined' => array( |
| 85 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 112 ), |
| | 85 | + array( 'src' => 'js/plugins.combined.js', 'version' => 113 ), |
| 86 | 86 | ), |
| 87 | 87 | 'minified' => array( |
| 88 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 112 ), |
| | 88 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 113 ), |
| 89 | 89 | ), |
| 90 | 90 | ), |
| 91 | 91 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js |
| — | — | @@ -414,7 +414,7 @@ |
| 415 | 415 | outline[h] = { 'text': match[2], 'wrapper': div, 'level': match[1].length, 'index': h + 1 }; |
| 416 | 416 | h++; |
| 417 | 417 | } |
| 418 | | - context.$content.html( context.$content.html().replace( /[\r\n]+/g, "<br>" ) ); |
| | 418 | + context.$content.html( context.$content.html().replace( /[\r?\n]/g, "<br>" ) ); |
| 419 | 419 | context.$content.each( traverseTextNodes ); |
| 420 | 420 | |
| 421 | 421 | // Normalize heading levels for list creation |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -3447,7 +3447,7 @@ |
| 3448 | 3448 | outline[h] = { 'text': match[2], 'wrapper': div, 'level': match[1].length, 'index': h + 1 }; |
| 3449 | 3449 | h++; |
| 3450 | 3450 | } |
| 3451 | | - context.$content.html( context.$content.html().replace( /[\r\n]+/g, "<br>" ) ); |
| | 3451 | + context.$content.html( context.$content.html().replace( /[\r?\n]/g, "<br>" ) ); |
| 3452 | 3452 | context.$content.each( traverseTextNodes ); |
| 3453 | 3453 | |
| 3454 | 3454 | // Normalize heading levels for list creation |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -224,7 +224,7 @@ |
| 225 | 225 | div=$(this).parent();else if($(this).parent().is('div')) |
| 226 | 226 | div=$(this).parent().addClass('wikiEditor-toc-header');else{div=$('<div />').text(text).css('display','inline').addClass('wikiEditor-toc-header');$(this).replaceWith(div);} |
| 227 | 227 | outline[h]={'text':match[2],'wrapper':div,'level':match[1].length,'index':h+1};h++;} |
| 228 | | -context.$content.html(context.$content.html().replace(/[\r\n]+/g,"<br>"));context.$content.each(traverseTextNodes);var lastLevel=0;var nLevel=0;for(var i=0;i<outline.length;i++){if(outline[i].level>lastLevel){nLevel++;} |
| | 228 | +context.$content.html(context.$content.html().replace(/[\r?\n]/g,"<br>"));context.$content.each(traverseTextNodes);var lastLevel=0;var nLevel=0;for(var i=0;i<outline.length;i++){if(outline[i].level>lastLevel){nLevel++;} |
| 229 | 229 | else if(outline[i].level<lastLevel){nLevel-=Math.max(1,lastLevel-outline[i].level);} |
| 230 | 230 | if(nLevel<=0){nLevel=1;} |
| 231 | 231 | outline[i].nLevel=nLevel;lastLevel=outline[i].level;} |