Merge branch 'master' of git@github.com:azatoth/twinkle.git

Conflicts: modules/twinkledeprod.js
vlakoff · May 13, 2012 · 1f1d4c3 · 1f1d4c3
2 parents e3aedd5 + a2f8a34
commit 1f1d4c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/modules/twinkledeprod.js b/modules/twinkledeprod.js
@@ -39,11 +39,12 @@
 			'rvprop': [ 'content' ]
 		};
 
-		var wikipedia_api = new Wikipedia.api( 'Grabbing pages', query, function( self ) {
-			var $doc = $(self.responseXML);
-			var $pages = $doc.find('page[ns!="6"]');  // all non-files
-			var list = [];
-			var re = new RegExp("{{Proposed deletion");
+		var wikipedia_api = new Wikipedia.api( 'Grabbing pages', query,
+			function( self ) {
+				var $doc = $(self.responseXML);
+				var $pages = $doc.find('page[ns!="6"]');  // all non-files
+				var list = [];
+				var re = /{{Proposed deletion/;
 				$pages.each(function() {
 					var $self = $(this);
 					var page = $self.attr('title');

diff --git a/sync.pl b/sync.pl
@@ -16,9 +16,9 @@
     "$0 %o <files...>",
     [ 'username|u=s', "username for account on wikipedia", {default => $c->{username} // ""} ],
     [ 'password|p=s', "password for account on wikipedia (do not use)", {default => $c->{password} // ""} ],
-    [ 'base|b=s', "base localtion on wikipedia where files exists (default User:AzaToth or entry in .mwbotrc)", {default => $c->{base} // "User:AzaToth"} ],
-	[ 'lang=s', 'Target language', {default => 'en'} ],
-	[ 'family=s', 'Target family', {default => 'wikipedia'} ],
+    [ 'base|b=s', "base location on wikipedia where files exist (default User:AzaToth or entry in .mwbotrc)", {default => $c->{base} // "User:AzaToth"} ],
+    [ 'lang=s', 'Target language', {default => 'en'} ],
+    [ 'family=s', 'Target family', {default => 'wikipedia'} ],
     [ 'mode' => hidden =>
         {
             required => 1,