From 2957dda6a5f64dd85e51511286defad368800a4a Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 27 Sep 2009 18:29:24 +0000 Subject: [PATCH] * add semi-colon in lines 226 and 230 * indentation updates --- js2/ajaxcategories.js | 299 ++++++++++++++++++++++-------------------- 1 file changed, 159 insertions(+), 140 deletions(-) diff --git a/js2/ajaxcategories.js b/js2/ajaxcategories.js index f519ff5f67..850b01da3d 100644 --- a/js2/ajaxcategories.js +++ b/js2/ajaxcategories.js @@ -1,40 +1,41 @@ loadGM( { - "ajax-add-category":"[Add Category]", - "ajax-add-category-submit":"[Add]", - "ajax-confirm-prompt":"[Confirmation Text]", - "ajax-confirm-title":"[Confirmation Title]", - "ajax-confirm-save":"[Save]", - "ajax-add-category-summary":"[Add category $1]", - "ajax-remove-category-summary":"[Remove category $2]", - "ajax-confirm-actionsummary":"[Summary]", - "ajax-error-title":"Error", - "ajax-error-dismiss":"OK", - "ajax-remove-category-error":"[RemoveErr]" - } ); + "ajax-add-category" : "[Add Category]", + "ajax-add-category-submit" : "[Add]", + "ajax-confirm-prompt" : "[Confirmation Text]", + "ajax-confirm-title" : "[Confirmation Title]", + "ajax-confirm-save" : "[Save]", + "ajax-add-category-summary" : "[Add category $1]", + "ajax-remove-category-summary" : "[Remove category $2]", + "ajax-confirm-actionsummary" : "[Summary]", + "ajax-error-title" : "Error", + "ajax-error-dismiss" : "OK", + "ajax-remove-category-error" : "[RemoveErr]" +} ); var ajaxCategories = { - handleAddLink : function(e) { e.preventDefault(); - + // Make sure the suggestion plugin is loaded. Load everything else while we're at it - mvJsLoader.doLoad( ['$j.ui', '$j.ui.dialog', '$j.fn.suggestions'], + mvJsLoader.doLoad( + ['$j.ui', '$j.ui.dialog', '$j.fn.suggestions'], function() { $j('#mw-addcategory-prompt').toggle(); - + $j('#mw-addcategory-input').suggestions( { - 'fetch':ajaxCategories.fetchSuggestions, - 'cancel': function() { - var req = ajaxCategories.request; - if (req.abort) - req.abort() - }, - } ); - + 'fetch':ajaxCategories.fetchSuggestions, + 'cancel': function() { + var req = ajaxCategories.request; + if (req.abort) + req.abort() + }, + } ); + $j('#mw-addcategory-input').suggestions(); - } ); + } + ); }, - + fetchSuggestions : function( query ) { var that = this; var request = $j.ajax( { @@ -51,44 +52,49 @@ var ajaxCategories = { // Process data.query.allpages into an array of titles var pages = data.query.allpages; var titleArr = []; - + $j.each(pages, function(i, page) { var title = page.title.split( ':', 2 )[1]; titleArr.push(title); } ); - + $j(that).suggestions( 'suggestions', titleArr ); } }); - + ajaxCategories.request = request; }, - + reloadCategoryList : function( response ) { var holder = $j('
'); - - holder.load( window.location.href+' .catlinks', function() { - $j('.catlinks').replaceWith( holder.find('.catlinks') ); - ajaxCategories.setupAJAXCategories(); - ajaxCategories.removeProgressIndicator( $j('.catlinks') ); - }); + + holder.load( + window.location.href+' .catlinks', + function() { + $j('.catlinks').replaceWith( holder.find('.catlinks') ); + ajaxCategories.setupAJAXCategories(); + ajaxCategories.removeProgressIndicator( $j('.catlinks') ); + } + ); }, - + confirmEdit : function( page, fn, actionSummary, doneFn ) { // Load jQuery UI - mvJsLoader.doLoad( ['$j.ui', '$j.ui.dialog', '$j.fn.suggestions'], function() { + mvJsLoader.doLoad( + ['$j.ui', '$j.ui.dialog', '$j.fn.suggestions'], + function() { // Produce a confirmation dialog - + var dialog = $j('
'); - + dialog.addClass('mw-ajax-confirm-dialog'); dialog.attr( 'title', gM('ajax-confirm-title') ); - + // Intro text. var confirmIntro = $j('

'); confirmIntro.text( gM('ajax-confirm-prompt') ); dialog.append(confirmIntro); - + // Summary of the action to be taken var summaryHolder = $j('

'); var summaryLabel = $j(''); @@ -96,63 +102,70 @@ var ajaxCategories = { summaryHolder.text( actionSummary ); summaryHolder.prepend( summaryLabel ); dialog.append(summaryHolder); - + // Reason textbox. var reasonBox = $j(''); reasonBox.addClass('mw-ajax-confirm-reason'); dialog.append(reasonBox); - + // Submit button var submitButton = $j(''); submitButton.val( gM( 'ajax-confirm-save' ) ); - + var submitFunction = function() { - ajaxCategories.addProgressIndicator( dialog ); - ajaxCategories.doEdit( page, fn, reasonBox.val(), - function() { - doneFn(); - dialog.dialog('close'); - ajaxCategories.removeProgressIndicator( dialog ); - } - ); - }; - + ajaxCategories.addProgressIndicator( dialog ); + ajaxCategories.doEdit( + page, + fn, + reasonBox.val(), + function() { + doneFn(); + dialog.dialog('close'); + ajaxCategories.removeProgressIndicator( dialog ); + } + ); + }; + var buttons = {}; buttons[gM('ajax-confirm-save')] = submitFunction; - var dialogOptions = { - 'AutoOpen' : true, - 'buttons' : buttons, - 'width' : 450, - }; - + var dialogOptions = { + 'AutoOpen' : true, + 'buttons' : buttons, + 'width' : 450, + }; + $j('#catlinks').prepend(dialog); dialog.dialog( dialogOptions ); - } ); + } + ); }, - + doEdit : function( page, fn, summary, doneFn ) { // Get an edit token for the page. var getTokenVars = { - 'action':'query', - 'prop':'info|revisions', - 'intoken':'edit', - 'titles':page, - 'rvprop':'content|timestamp', - 'format':'json', - }; - $j.get(wgScriptPath+'/api.php', getTokenVars, + 'action':'query', + 'prop':'info|revisions', + 'intoken':'edit', + 'titles':page, + 'rvprop':'content|timestamp', + 'format':'json', + }; + + $j.get(wgScriptPath+'/api.php', getTokenVars, function( reply ) { var infos = reply.query.pages; - $j.each(infos, function(pageid, data) { - var token = data.edittoken; - var timestamp = data.revisions[0].timestamp; - var oldText = data.revisions[0]['*']; - - var newText = fn(oldText); - - if (newText === false) return; - - var postEditVars = { + $j.each( + infos, + function(pageid, data) { + var token = data.edittoken; + var timestamp = data.revisions[0].timestamp; + var oldText = data.revisions[0]['*']; + + var newText = fn(oldText); + + if (newText === false) return; + + var postEditVars = { 'action':'edit', 'title':page, 'text':newText, @@ -160,43 +173,48 @@ var ajaxCategories = { 'token':token, 'basetimestamp':timestamp, 'format':'json', - }; - - $j.post( wgScriptPath+'/api.php', postEditVars, doneFn, 'json' ); - } ); + }; + + $j.post( wgScriptPath+'/api.php', postEditVars, doneFn, 'json' ); + } + ); } , 'json' ); }, - + addProgressIndicator : function( elem ) { var indicator = $j('

'); - + indicator.addClass('mw-ajax-loader'); - + elem.append( indicator ); }, - + removeProgressIndicator : function( elem ) { elem.find('.mw-ajax-loader').remove(); }, - + handleCategoryAdd : function(e) { // Grab category text var category = $j('#mw-addcategory-input').val(); var appendText = "\n[["+wgFormattedNamespaces[14]+":"+category+"]]\n"; var summary = gM('ajax-add-category-summary', category); - - ajaxCategories.confirmEdit( wgPageName, function(oldText) { return oldText+appendText }, - summary, ajaxCategories.reloadCategoryList ); + + ajaxCategories.confirmEdit( + wgPageName, + function(oldText) { return oldText+appendText }, + summary, + ajaxCategories.reloadCategoryList + ); }, - + handleDeleteLink : function(e) { e.preventDefault(); - + var category = $j(this).parent().find('a').text(); - + // Build a regex that matches legal invocations of that category. - + // In theory I should escape the aliases, but there's no JS function for it // Shouldn't have any real impact, can't be exploited or anything, so we'll // leave it for now. @@ -205,46 +223,48 @@ var ajaxCategories = { if (id == 14) { // Allow the first character to be any case var firstChar = name.charAt(0); - firstChar = '['+firstChar.toUpperCase()+firstChar.toLowerCase()+']' + firstChar = '['+firstChar.toUpperCase()+firstChar.toLowerCase()+']'; categoryNSFragment += '|'+firstChar+name.substr(1); } } ); - categoryNSFragment = categoryNSFragment.substr(1) // Remove leading | - - + categoryNSFragment = categoryNSFragment.substr(1); // Remove leading | + // Build the regex var titleFragment = category; - + firstChar = category.charAt(0); firstChar = '['+firstChar.toUpperCase()+firstChar.toLowerCase()+']'; titleFragment = firstChar+category.substr(1); var categoryRegex = '\\[\\['+categoryNSFragment+':'+titleFragment+'(\\|[^\\]]*)?\\]\\]'; categoryRegex = new RegExp( categoryRegex, 'g' ); - + var summary = gM('ajax-remove-category-summary', category); - - ajaxCategories.confirmEdit( wgPageName, - function(oldText) { - var newText = oldText.replace(categoryRegex, ''); - - if (newText == oldText) { - var error = gM('ajax-remove-category-error'); - ajaxCategories.showError( error ); - ajaxCategories.removeProgressIndicator( $j('.mw-ajax-confirm-dialog') ); - $j('.mw-ajax-confirm-dialog').dialog('close'); - return false; - } - - return newText; - }, summary, ajaxCategories.reloadCategoryList ); + + ajaxCategories.confirmEdit( + wgPageName, + function(oldText) { + var newText = oldText.replace(categoryRegex, ''); + + if (newText == oldText) { + var error = gM('ajax-remove-category-error'); + ajaxCategories.showError( error ); + ajaxCategories.removeProgressIndicator( $j('.mw-ajax-confirm-dialog') ); + $j('.mw-ajax-confirm-dialog').dialog('close'); + return false; + } + + return newText; + }, + summary, ajaxCategories.reloadCategoryList + ); }, - + showError : function( str ) { var dialog = $j('
'); dialog.text(str); - + $j('#bodyContent').append(dialog); - + var buttons = {}; buttons[gM('ajax-error-dismiss')] = function(e) { dialog.dialog('close'); }; var dialogOptions = { @@ -252,54 +272,53 @@ var ajaxCategories = { 'AutoOpen' : true, 'title' : gM('ajax-error-title'), }; - + dialog.dialog(dialogOptions); }, - + setupAJAXCategories : function() { // Only do it for articles. if ( !wgIsArticle ) return; - + var clElement = $j('.catlinks'); - + // Unhide hidden category holders. clElement.removeClass( 'catlinks-allhidden' ); - + var addLink = $j(''); addLink.addClass( 'mw-ajax-addcategory' ); - + // Create [Add Category] link addLink.text( gM( 'ajax-add-category' ) ); addLink.attr('href', '#'); addLink.click( ajaxCategories.handleAddLink ); clElement.append(addLink); - + // Create add category prompt var promptContainer = $j('