r61293 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r61292‎ | r61293 | r61294 >
Date:14:11, 20 January 2010
Author:adam
Status:deferred
Tags:
Comment:
A few dialog tweeks
Modified paths:
  • /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/combined.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/combined.min.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/wikiEditor.toolbar.css (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
@@ -55,3 +55,7 @@
5656 body.rtl .ui-dialog .ui-dialog-title {
5757 float:right;
5858 }
 59+
 60+.ui-widget-header {
 61+ border-bottom:1px solid #6bc8f3 !important;
 62+}
\ No newline at end of file
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.toolbar.css
@@ -353,7 +353,6 @@
354354 width: 340px;
355355 background: #fff;
356356 padding: 10px;
357 - border: 1px solid #cdcdcd;
358357 overflow: hidden;
359358 display: block;
360359 position: relative;
Index: trunk/extensions/UsabilityInitiative/css/combined.css
@@ -264,7 +264,10 @@
265265 body.rtl .ui-dialog .ui-dialog-title {
266266 float:right;
267267 }
268 -/* wikiEditor toc module */
 268+
 269+.ui-widget-header {
 270+ border-bottom:1px solid #6bc8f3 !important;
 271+}/* wikiEditor toc module */
269272 .wikiEditor-ui-toc {
270273 /* height and width are set dynamically */
271274 /*float: right;*/
@@ -828,7 +831,6 @@
829832 width: 340px;
830833 background: #fff;
831834 padding: 10px;
832 - border: 1px solid #cdcdcd;
833835 overflow: hidden;
834836 display: block;
835837 position: relative;
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css
@@ -248,6 +248,9 @@
249249 body.rtl .ui-dialog .ui-dialog-title{
250250 float:right;
251251 }
 252+.ui-widget-header{
 253+border-bottom:1px solid #6bc8f3 !important;
 254+}
252255 .wikiEditor-ui-toc{
253256 padding:0;
254257 overflow:auto;
@@ -779,7 +782,6 @@
780783 width:340px;
781784 background:#fff;
782785 padding:10px;
783 -border:1px solid #cdcdcd;
784786 overflow:hidden;
785787 display:block;
786788 position:relative;
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
@@ -1384,7 +1384,6 @@
13851385 });
13861386 },
13871387 dialog: {
1388 - resizable: false,
13891388 width: 500,
13901389 buttons: {
13911390 'wikieditor-toolbar-tool-link-insert': function() {
@@ -1857,7 +1856,6 @@
18581857 });
18591858 },
18601859 dialog: {
1861 - resizable: false,
18621860 width: 500,
18631861 buttons: {
18641862 'wikieditor-toolbar-tool-replace-button-findnext': function( e ) {
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
@@ -54,7 +54,7 @@
5555 updateExistence();});$j('#wikieditor-toolbar-link-int-target').data('suggcache',{}).suggestions({fetch:function(query){var that=this;var title=$j(this).val();if(isExternalLink(title)||title.indexOf('|')!=-1||title==''){$j(this).suggestions('suggestions',[]);return;}
5656 var cache=$j(this).data('suggcache');if(typeof cache[title]!='undefined'){$j(this).suggestions('suggestions',cache[title]);return;}
5757 var request=$j.ajax({url:wgScriptPath+'/api.php',data:{'action':'opensearch','search':title,'namespace':0,'suggest':'','format':'json'},dataType:'json',success:function(data){cache[title]=data[1];$j(that).suggestions('suggestions',data[1]);}});$j(this).data('request',request);},cancel:function(){var request=$j(this).data('request');if(request)
58 -request.abort();}});},dialog:{resizable:false,width:500,buttons:{'wikieditor-toolbar-tool-link-insert':function(){function escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}
 58+request.abort();}});},dialog:{width:500,buttons:{'wikieditor-toolbar-tool-link-insert':function(){function escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}
5959 function escapeExternalTarget(s){return s.replace(/ /g,'%20').replace(/]/g,'%5D');}
6060 function escapeExternalText(s){return s.replace(/(]+)/g,'<nowiki>$1</nowiki>');}
6161 var insertText='';var whitespace=$j('#wikieditor-toolbar-link-dialog').data('whitespace');var target=$j('#wikieditor-toolbar-link-int-target').val();var text=$j('#wikieditor-toolbar-link-int-text').val();if(target==''){alert(gM('wikieditor-toolbar-tool-link-empty'));return;}
@@ -166,6 +166,6 @@
167167 matches=text.match(regex);if(!matches)
168168 $j('#wikieditor-toolbar-replace-nomatch').show();else if(mode=='replaceAll'){var start=text.lastIndexOf(matches[matches.length-1]);var end=start+replaceStr.length;var replaced=text.replace(regex,replaceStr);var corr=replaced.length-text.length-replaceStr.length+matches[matches.length-1].length;$textarea.val(replaced).change().focus().textSelection('setSelection',{'start':start+corr,'end':end+corr}).textSelection('scrollToCaretPosition');$j('#wikieditor-toolbar-replace-success').text(gM('wikieditor-toolbar-tool-replace-success',matches.length)).show();$j(this).data('offset',0);}else{var start=text.indexOf(matches[0],$j(this).data('offset'));if(start==-1)
169169 start=text.indexOf(matches[0]);var end=start+matches[0].length;var newEnd=start+replaceStr.length;$textarea.focus().textSelection('setSelection',{'start':start,'end':end});if(mode=='replace'){$textarea.textSelection('encapsulateSelection',{'peri':replaceStr,'replace':true}).textSelection('setSelection',{'start':start,'end':newEnd});}
170 -$textarea.textSelection('scrollToCaretPosition');$j(this).data('offset',mode=='replace'?newEnd:end);}});},dialog:{resizable:false,width:500,buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){var button=$j(this).data('dialogaction')||$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
 170+$textarea.textSelection('scrollToCaretPosition');$j(this).data('offset',mode=='replace'?newEnd:end);}});},dialog:{width:500,buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){var button=$j(this).data('dialogaction')||$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
171171 var dialog=$j(this).closest('.ui-dialog');$j(this).data('context').$textarea.bind('keypress.srdialog',function(e){if((e.keyCode||e.which)==13){var button=dialog.data('dialogaction')||dialog.find('button:first');button.click();e.preventDefault();}});},close:function(){$j(this).data('context').$textarea.unbind('keypress.srdialog').focus();$j(this).closest('.ui-dialog').data('dialogaction',false);}}}}});}});mw.loadDone('wikiEditor.config.toolbar');mw.addMessages({"wikieditor-template-editor-preference":"Enable form-based editing of wiki templates"});mw.ready(function(){if(!wgWikiEditorEnabledModules.templateEditor){return true;}
172172 if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','templateEditor');}});mw.loadDone('wikiEditor.config.templateEditor');
\ No newline at end of file
Index: trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
@@ -1303,7 +1303,6 @@
13041304 });
13051305 },
13061306 dialog: {
1307 - resizable: false,
13081307 width: 500,
13091308 buttons: {
13101309 'wikieditor-toolbar-tool-link-insert': function() {
@@ -1776,7 +1775,6 @@
17771776 });
17781777 },
17791778 dialog: {
1780 - resizable: false,
17811779 width: 500,
17821780 buttons: {
17831781 'wikieditor-toolbar-tool-replace-button-findnext': function( e ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r61294version bump for r61293adam14:11, 20 January 2010

Status & tagging log