| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -78,14 +78,14 @@ |
| 79 | 79 | array( 'src' => 'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 22 ), |
| 80 | 80 | array( 'src' => 'js/plugins/jquery.wikiEditor.toc.js', 'version' => 98 ), |
| 81 | 81 | array( 'src' => 'js/plugins/jquery.wikiEditor.preview.js', 'version' => 11 ), |
| 82 | | - array( 'src' => 'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 70 ), |
| | 82 | + array( 'src' => 'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 71 ), |
| 83 | 83 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ), |
| 84 | 84 | ), |
| 85 | 85 | 'combined' => array( |
| 86 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 360 ), |
| | 86 | + array( 'src' => 'js/plugins.combined.js', 'version' => 361 ), |
| 87 | 87 | ), |
| 88 | 88 | 'minified' => array( |
| 89 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 360 ), |
| | 89 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 361 ), |
| 90 | 90 | ), |
| 91 | 91 | ), |
| 92 | 92 | ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.templateEditor.js |
| — | — | @@ -649,7 +649,7 @@ |
| 650 | 650 | }; |
| 651 | 651 | |
| 652 | 652 | // Whitespace* {{ whitespace* nonwhitespace: |
| 653 | | - if ( wikitext.match( /\s*{{\s*\S*:/ ) ) { |
| | 653 | + if ( wikitext.match( /\s*{{\s*[^\s|]*:/ ) ) { |
| 654 | 654 | collapsible = false; // is a parser function |
| 655 | 655 | } |
| 656 | 656 | /* |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -9958,7 +9958,7 @@ |
| 9959 | 9959 | }; |
| 9960 | 9960 | |
| 9961 | 9961 | // Whitespace* {{ whitespace* nonwhitespace: |
| 9962 | | - if ( wikitext.match( /\s*{{\s*\S*:/ ) ) { |
| | 9962 | + if ( wikitext.match( /\s*{{\s*[^\s|]*:/ ) ) { |
| 9963 | 9963 | collapsible = false; // is a parser function |
| 9964 | 9964 | } |
| 9965 | 9965 | /* |
| Index: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -679,7 +679,7 @@ |
| 680 | 680 | this.getOriginalText=function(){return wikitext;};this.getText=function(){newText="";for(i=0;i<ranges.length;i++){if(typeof ranges[i].newVal=='undefined'){newText+=wikitext.substring(ranges[i].begin,ranges[i].end);}else{newText+=ranges[i].newVal;}} |
| 681 | 681 | return newText;};this.isCollapsible=function(){return collapsible;} |
| 682 | 682 | this.updateRanges=function(){var adjustment=0;for(var i=0;i<ranges.length;i++){ranges[i].begin+=adjustment;if(typeof ranges[i].adjust!='undefined'){adjustment+=ranges[i].adjust();delete ranges[i].adjust;} |
| 683 | | -ranges[i].end+=adjustment;}};if(wikitext.match(/\s*{{\s*\S*:/)){collapsible=false;} |
| | 683 | +ranges[i].end+=adjustment;}};if(wikitext.match(/\s*{{\s*[^\s|]*:/)){collapsible=false;} |
| 684 | 684 | var sanatizedStr=wikitext.replace(/{{/," ");endBraces=sanatizedStr.match(/}}\s*$/);if(endBraces){sanatizedStr=sanatizedStr.substring(0,endBraces.index)+" "+ |
| 685 | 685 | sanatizedStr.substring(endBraces.index+2);} |
| 686 | 686 | while(sanatizedStr.indexOf('<!')!=-1){startIndex=sanatizedStr.indexOf('<!');endIndex=sanatizedStr.indexOf('-->')+3;if(endIndex<3){break;} |