Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php |
— | — | @@ -35,7 +35,7 @@ |
36 | 36 | array( |
37 | 37 | 'src' => 'Modules/Toolbar/Toolbar.js', |
38 | 38 | 'class' => 'wikiEditor.config.toolbar', |
39 | | - 'version' => 22 |
| 39 | + 'version' => 23 |
40 | 40 | ), |
41 | 41 | array( |
42 | 42 | 'src' => 'Modules/TemplateEditor/TemplateEditor.js', |
— | — | @@ -44,10 +44,10 @@ |
45 | 45 | ), |
46 | 46 | ), |
47 | 47 | 'combined' => array( |
48 | | - array( 'src' => 'WikiEditor.combined.js', 'version' => 23 ), |
| 48 | + array( 'src' => 'WikiEditor.combined.js', 'version' => 24 ), |
49 | 49 | ), |
50 | 50 | 'minified' => array( |
51 | | - array( 'src' => 'WikiEditor.combined.min.js', 'version' => 23 ), |
| 51 | + array( 'src' => 'WikiEditor.combined.min.js', 'version' => 24 ), |
52 | 52 | ), |
53 | 53 | ); |
54 | 54 | static $messages = array( |
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js |
— | — | @@ -1237,7 +1237,8 @@ |
1238 | 1238 | .val( $j( this ).prev( 'label' ).text() ) |
1239 | 1239 | .addClass( 'wikieditor-toolbar-dialog-hint' ); |
1240 | 1240 | }) |
1241 | | - .trigger( 'focus' ) |
| 1241 | + // FIXME: this is causing scroll to bottom on load |
| 1242 | + //.trigger( 'focus' ) |
1242 | 1243 | .prev( 'label' ) |
1243 | 1244 | .css( 'display', 'none' ); |
1244 | 1245 | |
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js |
— | — | @@ -42,7 +42,7 @@ |
43 | 43 | cache[target]=status;updateWidget(status);}}));} |
44 | 44 | $j(this).find('[rel]').each(function(){$j(this).text(gM($j(this).attr('rel')));});$j('#wikieditor-toolbar-link-int-target, #wikieditor-toolbar-link-int-text').focus(function(){if($j(this).val()==$j(this).prev('label').text()) |
45 | 45 | $j(this).val('').removeClass('wikieditor-toolbar-dialog-hint');}).bind('blur change',function(){if($j(this).val()=='') |
46 | | -$j(this).val($j(this).prev('label').text()).addClass('wikieditor-toolbar-dialog-hint');}).trigger('focus').prev('label').css('display','none');$j('#wikieditor-toolbar-link-int-target').bind('change keydown paste cut',function(){setTimeout(function(){if(isExternalLink($j('#wikieditor-toolbar-link-int-target').val())) |
| 46 | +$j(this).val($j(this).prev('label').text()).addClass('wikieditor-toolbar-dialog-hint');}).prev('label').css('display','none');$j('#wikieditor-toolbar-link-int-target').bind('change keydown paste cut',function(){setTimeout(function(){if(isExternalLink($j('#wikieditor-toolbar-link-int-target').val())) |
47 | 47 | $j('#wikieditor-toolbar-link-type-ext').attr('checked','checked');else |
48 | 48 | $j('#wikieditor-toolbar-link-type-int').attr('checked','checked');if($j('#wikieditor-toolbar-link-int-text').data('untouched')) |
49 | 49 | $j('#wikieditor-toolbar-link-int-text').val($j('#wikieditor-toolbar-link-int-target').val()).change();},0);});$j('#wikieditor-toolbar-link-int-text').bind('change keydown paste cut',function(){var oldVal=$j(this).val();var that=this;setTimeout(function(){if($j(that).val()!=oldVal) |
Index: trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js |
— | — | @@ -1156,7 +1156,8 @@ |
1157 | 1157 | .val( $j( this ).prev( 'label' ).text() ) |
1158 | 1158 | .addClass( 'wikieditor-toolbar-dialog-hint' ); |
1159 | 1159 | }) |
1160 | | - .trigger( 'focus' ) |
| 1160 | + // FIXME: this is causing scroll to bottom on load |
| 1161 | + //.trigger( 'focus' ) |
1161 | 1162 | .prev( 'label' ) |
1162 | 1163 | .css( 'display', 'none' ); |
1163 | 1164 | |