http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63606
Revision: 63606
Author: tparscal
Date: 2010-03-11 17:14:41 +0000 (Thu, 11 Mar 2010)
Log Message:
-----------
Fixes issues in 63564 where an empty CSS rule was left behind after some
experimentation and in 63531 where $j was used instead of $ after a copy paste.
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.templateEditor.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
2010-03-11 16:00:11 UTC (rev 63605)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-03-11 17:14:41 UTC (rev 63606)
@@ -78,14 +78,14 @@
array( 'src' =>
'js/plugins/jquery.wikiEditor.dialogs.js', 'version' => 21 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.toc.js', 'version' => 97 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.preview.js', 'version' => 11 ),
- array( 'src' =>
'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 48 ),
+ array( 'src' =>
'js/plugins/jquery.wikiEditor.templateEditor.js', 'version' => 49 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.publish.js', 'version' => 3 ),
),
'combined' => array(
- array( 'src' => 'js/plugins.combined.js',
'version' => 323 ),
+ array( 'src' => 'js/plugins.combined.js',
'version' => 324 ),
),
'minified' => array(
- array( 'src' => 'js/plugins.combined.min.js',
'version' => 323 ),
+ array( 'src' => 'js/plugins.combined.min.js',
'version' => 324 ),
),
),
);
Modified: trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
2010-03-11 16:00:11 UTC (rev 63605)
+++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.html
2010-03-11 17:14:41 UTC (rev 63606)
@@ -90,10 +90,6 @@
.wikiEditor-template-name:hover {
text-decoration: underline;
}
- .wikiEditor-template-expanded .wikiEditor-template-name,
- .wikiEditor-template-expanded .wikiEditor-template-expand,
- .wikiEditor-template-expanded .wikiEditor-template-dialog {
- }
.wikiEditor-template-expanded .wikiEditor-template-expand {
background-image:
url(../../images/wikiEditor/templateEditor/collapse.png);
}
Modified:
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.templateEditor.js
===================================================================
---
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.templateEditor.js
2010-03-11 16:00:11 UTC (rev 63605)
+++
trunk/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.templateEditor.js
2010-03-11 17:14:41 UTC (rev 63606)
@@ -245,7 +245,7 @@
$( this ).dialog( 'close' );
},
'wikieditor-template-editor-dialog-cancel': function() {
- $j(this).dialog( 'close' );
+ $(this).dialog( 'close' );
}
},
open: function() {
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-03-11
16:00:11 UTC (rev 63605)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-03-11
17:14:41 UTC (rev 63606)
@@ -9488,7 +9488,7 @@
$( this ).dialog( 'close' );
},
'wikieditor-template-editor-dialog-cancel': function() {
- $j(this).dialog( 'close' );
+ $(this).dialog( 'close' );
}
},
open: function() {
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2010-03-11 16:00:11 UTC (rev 63605)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2010-03-11 17:14:41 UTC (rev 63606)
@@ -651,7 +651,7 @@
<fieldset>\
<div class="wikiEditor-template-dialog-title" />\
<div class="wikiEditor-template-dialog-fields" />\
-
</fieldset>',init:function(){$(this).find('[rel]').each(function(){$(this).text(mw.usability.getMsg($(this).attr('rel')));});},dialog:{width:600,height:400,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-template-editor-dialog-submit':function(){var
$templateDiv=$(this).data('templateDiv');context.fn.highlightLine($templateDiv);var
$templateText=$templateDiv.children('.wikiEditor-template-text');var
templateModel=$templateText.data('model');$(this).find('.wikiEditor-template-dialog-field-wrapper
textarea').each(function(){templateModel.setValue($(this).data('name'),$(this).val());});$.wikiEditor.modules.templateEditor.fn.updateModel($templateText,templateModel);$(this).dialog('close');},'wikieditor-template-editor-dialog-cancel':function(){$j(this).dialog('close');}},open:function(){var
$templateDiv=$(this).data('templateDiv');var
$templateText=$templateDiv.children('.wikiEditor-template-text');var
templateModel=$templateText.data('model');if($templateText.html()!=$templateText.data('oldHTML')){templateModel=$.wikiEditor.modules.templateEditor.fn.updateModel($templateText);}
+
</fieldset>',init:function(){$(this).find('[rel]').each(function(){$(this).text(mw.usability.getMsg($(this).attr('rel')));});},dialog:{width:600,height:400,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-template-editor-dialog-submit':function(){var
$templateDiv=$(this).data('templateDiv');context.fn.highlightLine($templateDiv);var
$templateText=$templateDiv.children('.wikiEditor-template-text');var
templateModel=$templateText.data('model');$(this).find('.wikiEditor-template-dialog-field-wrapper
textarea').each(function(){templateModel.setValue($(this).data('name'),$(this).val());});$.wikiEditor.modules.templateEditor.fn.updateModel($templateText,templateModel);$(this).dialog('close');},'wikieditor-template-editor-dialog-cancel':function(){$(this).dialog('close');}},open:function(){var
$templateDiv=$(this).data('templateDiv');var
$templateText=$templateDiv.children('.wikiEditor-template-text');var
templateModel=$templateText.data('model');if($templateText.html()!=$templateText.data('oldHTML')){templateModel=$.wikiEditor.modules.templateEditor.fn.updateModel($templateText);}
var params=templateModel.getAllInitialParams();var
$fields=$(this).find('.wikiEditor-template-dialog-fields');var
$rows=$fields.find('.wikiEditor-template-dialog-field-wrapper');for(var
paramIndex in params){var param=params[paramIndex];if(typeof
param.name=='undefined'){continue;}
var paramText=typeof param=='string'?param.name.replace(/[\_\-]/g,'
'):param.name;var
paramVal=templateModel.getValue(param.name);if($rows.length>0){var
$row=$rows.eq(0);$row.children('label').text(paramText);$row.children('textarea').data('name',param.name).val(paramVal).change();$rows=$rows.not($row);}else{var
$paramRow=$('<div
/>').addClass('wikiEditor-template-dialog-field-wrapper');$('<label
/>').text(paramText).appendTo($paramRow);$('<textarea
/>').data('name',param.name).val(paramVal).css('height',$(this).val().length>24?'4.5em':'1.5em').data('expanded',false).bind('cut
paste keypress click change',function(e){if(e.keyCode=='9')return true;var
$this=$(this);setTimeout(function(){var
expanded=$this.data('expanded');if($this.val().indexOf('\n')!=-1||$this.val().length>24){if(!expanded){$this.animate({'height':'4.5em'},'fast');$this.data('expanded',true);}}else{if(expanded){$this.animate({'height':'1.5em'},'fast');$this.data('expanded',false);}}},0);}).appendTo($paramRow);$paramRow.append('<div
style="clear:both"></div>').appendTo($fields);}}
$rows.remove();$fields.find('label').autoEllipsis();$(this).parent('.ui-dialog').find('.ui-dialog-titlebar-close').removeClass('ui-state-focus');}}};context.$textarea.wikiEditor('addDialog',{'templateEditor':dialog});$('#'+dialog.id).data('templateDiv',$template).dialog('open');},updateModel:function($templateText,model){var
context=$templateText.data('marker').context;var text;if(typeof
model=='undefined'){text=context.fn.htmlToText($templateText.html());}else{text=model.getText();}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
