| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.templateEditor.js |
| — | — | @@ -68,7 +68,8 @@ |
| 69 | 69 | end: tokenArray[endIndex].offset, |
| 70 | 70 | type: 'template', |
| 71 | 71 | anchor: 'wrap', |
| 72 | | - splitPs: model.isCollapsible(), |
| | 72 | + //splitPs: model.isCollapsible(), |
| | 73 | + splitPs: false, |
| 73 | 74 | afterWrap: $.wikiEditor.modules.templateEditor.fn.stylize, |
| 74 | 75 | beforeUnwrap: function( node ) { |
| 75 | 76 | // FIXME: $( node ).data( 'display' ) doesn't exist any more |
| — | — | @@ -130,7 +131,7 @@ |
| 131 | 132 | } |
| 132 | 133 | |
| 133 | 134 | var $template = $( this ) |
| 134 | | - .wrap( '<div class="wikiEditor-template"></div>' ) |
| | 135 | + .wrap( '<span class="wikiEditor-template"></span>' ) |
| 135 | 136 | .addClass( 'wikiEditor-template-text wikiEditor-nodisplay' ) |
| 136 | 137 | .parent() |
| 137 | 138 | .addClass( 'wikiEditor-template-collapsed' ) |
| — | — | @@ -139,10 +140,11 @@ |
| 140 | 141 | $( '<span />' ) |
| 141 | 142 | .addClass( 'wikiEditor-template-name wikiEditor-noinclude' ) |
| 142 | 143 | .text( model.getName() ) |
| 143 | | - .mousedown( function(){createDialog( $template );} ) //have to pass template so model stays in sync |
| | 144 | + .mousedown(toggleWikiTextEditor) |
| | 145 | + //.mousedown( function(){createDialog( $template );} ) //have to pass template so model stays in sync |
| 144 | 146 | .prependTo( $template ); |
| 145 | 147 | |
| 146 | | - |
| | 148 | + /* |
| 147 | 149 | var $options = $( '<ul />' ) |
| 148 | 150 | .addClass( 'wikiEditor-template-modes wikiEditor-noinclude' ) |
| 149 | 151 | .append( $( '<li />' ) |
| — | — | @@ -151,7 +153,7 @@ |
| 152 | 154 | $.wikiEditor.imgPath + 'templateEditor/' + 'wiki-text.png' ) ) |
| 153 | 155 | .mousedown( toggleWikiTextEditor ) ) |
| 154 | 156 | .insertAfter( $template.find( '.wikiEditor-template-name' ) ); |
| 155 | | - |
| | 157 | + */ |
| 156 | 158 | $(this).data( 'setupDone', true ); |
| 157 | 159 | |
| 158 | 160 | function toggleWikiTextEditor(){ |
| — | — | @@ -670,7 +672,6 @@ |
| 671 | 673 | this.params = params; |
| 672 | 674 | this.paramsByName = paramsByName; |
| 673 | 675 | this.templateNameIndex = templateNameIndex; |
| 674 | | - } // model |
| 675 | | -} |
| 676 | | - |
| | 676 | + } //model |
| | 677 | +} |
| 677 | 678 | }; } )( jQuery ); |
| Index: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html |
| — | — | @@ -98,6 +98,7 @@ |
| 99 | 99 | margin-top: -3px; |
| 100 | 100 | border: solid 1px #d9d9d9; |
| 101 | 101 | padding-left: 4px; |
| | 102 | + display: block; |
| 102 | 103 | } |
| 103 | 104 | .wikiEditor-template-end, .wikiEditor-template-start{ |
| 104 | 105 | color: blue; |