Changeset 6443

Timestamp:

08/21/08 10:02:26 (5 months ago)

Author:

MartinBudden

Message:

Updated to TiddlyWiki 2.4.1

Files:

• Trunk/contributors/MartinBudden/adaptors/MediaWikiAdaptorPlugin.js (modified) (13 diffs)

Trunk/contributors/MartinBudden/adaptors/MediaWikiAdaptorPlugin.js

@@ -5 +5 @@
 |''Source:''|http://www.martinswiki.com/#MediaWikiAdaptorPlugin |
 |''CodeRepository:''|http://svn.tiddlywiki.org/Trunk/contributors/MartinBudden/adaptors/MediaWikiAdaptorPlugin.js |
-|''Version:''|0.6.4|
+|''Version:''|0.7.1|
 |''Date:''|Jul 27, 2007|
 |''Comments:''|Please make comments at http://groups.google.co.uk/group/TiddlyWikiDev |
@@ -40 +40 @@
 function MediaWikiAdaptor()
 {
-        this.host = null;
-        this.workspace = null;
         return this;
 }
+
+MediaWikiAdaptor.prototype = new AdaptorBase();
 
 MediaWikiAdaptor.serverType = 'mediawiki';
@@ -51 +51 @@
 MediaWikiAdaptor.doHttpGET = function(uri,callback,params,headers,data,contentType,username,password)
 {
-        return doHttp('GET',uri,data,contentType,username,password,callback,params,headers);
+        return httpReq('GET',uri,callback,params,headers,data,contentType,username,password);
 };
 
 MediaWikiAdaptor.doHttpPOST = function(uri,callback,params,headers,data,contentType,username,password)
 {
-        return doHttp('POST',uri,data,contentType,username,password,callback,params,headers);
-};
-
-MediaWikiAdaptor.prototype.setContext = function(context,userParams,callback)
-{
-        if(!context) context = {};
-        context.userParams = userParams;
-        if(callback) context.callback = callback;
-        context.adaptor = this;
-        if(!context.host)
-                context.host = this.host;
-        if(!context.workspace && this.workspace)
-                context.workspace = this.workspace;
-        return context;
-};
-
-MediaWikiAdaptor.fullHostName = function(host)
-{
-//#displayMessage("fullHostName:"+host);
-        if(!host)
-                return '';
-        host = host.trim();
-        if(!host.match(/:\/\//))
-                host = 'http://' + host;
-        if(host.substr(host.length-1) == '/')
-                host = host.substr(0,host.length-1);
-        return host;
+        return httpReq('POST',uri,callback,params,headers,data,contentType,username,password);
 };
 
@@ -144 +118 @@
 //#console.log('login');
         //#context = this.setContext(context,userParams,callback);
-        var host = MediaWikiAdaptor.fullHostName(context.host);
+        var host = this.fullHostName(context.host);
         var uriTemplate = '%0/api.php?action=login&format=json&lgname=%1&lgpassword=%2';
         //var uriTemplate = '%0/api.php?action=query&format=json&prop=info|revisions&intoken=edit&titles=Main%20Page';
@@ -199 +173 @@
                         context.callback(context,context.userParams);
         }
-};
-
-
-MediaWikiAdaptor.prototype.openHost = function(host,context,userParams,callback)
-{
-//#console.log("openHost:"+host);
-        this.host = MediaWikiAdaptor.fullHostName(host);
-        context = this.setContext(context,userParams,callback);
-        if(context.callback) {
-                context.status = true;
-                window.setTimeout(function() {callback(context,userParams);},0);
-        }
-        return true;
 };
 
@@ -367 +328 @@
         context.tiddlers = [];
         context.uri = null;
-        var host = MediaWikiAdaptor.fullHostName(this.host);
+        var host = this.fullHostName(context.host);
         if(!context.tiddlerLimit)
                 context.tiddlerLimit = !config.options.txtMediaAdaptorLimit ? config.maxTiddlerImportCount : config.options.txtMediaAdaptorLimit;
@@ -525 +486 @@
 //# http://en.wikipedia.org/wiki/Mars
         var info = {};
-        var host = this && this.host ? this.host : MediaWikiAdaptor.fullHostName(tiddler.fields['server.host']);
+        var host = this && this.host ? this.host : tiddler.fields['server.host'];
+        host = this.fullHostName(host);
         if(host.match(/w\/$/)) {
                 host = host.replace(/w\/$/,'');
@@ -552 +514 @@
 //# http://www.tiddlywiki.org/api.php?action=query&prop=revisions&titles=Main%20Page&rvprop=content
 //# http://wiki.unamesa.org/api.php?format=jsonfm&action=query&prop=revisions&titles=Main%20Page&rvprop=content|timestamp|user
-        var host = MediaWikiAdaptor.fullHostName(context.host);
+        var host = this.fullHostName(context.host);
         var uriTemplate = '%0/api.php?format=json&action=query&prop=revisions&titles=%1&rvprop=content|timestamp|user';
         if(context.revision)
@@ -702 +664 @@
         if(!limit)
                 limit = 5;
-        var host = MediaWikiAdaptor.fullHostName(context.host);
+        var host = this.fullHostName(context.host);
         var uri = uriTemplate.format([host,MediaWikiAdaptor.normalizedTitle(title),limit]);
 //#console.log('uri: '+uri);
@@ -715 +677 @@
 //#console.log('getTiddlerRevisionListCallback status:'+status);
 //#console.log(responseText.substr(0,1000));
-//#displayMessage('xhr:'+xhr);
         context.status = false;
         if(status) {
@@ -779 +740 @@
 {
 //#console.log('putTiddlerComplete');
-        var host = MediaWikiAdaptor.fullHostName(context.host);
+        var host = this.fullHostName(context.host);
         var uriTemplate = '%0/api.php?action=edit&title=%1&token=%2&text=%3';
         var uri = uriTemplate.format([host,escape(MediaWikiAdaptor.normalizedTitle(context.tiddler.title)),context.sessionToken,escape(context.tiddler.text)]);
@@ -816 +777 @@
 {
 //#fnLog('deleteTiddlerComplete:'+title);
-        var host = MediaWikiAdaptor.fullHostName(context.host);
+        var host = this.fullHostName(context.host);
         var uriTemplate = '%0/api.php?action=delete&title=%1&token=%2';
         var uri = uriTemplate.format([host,context.workspace,escape(MediaWikiAdaptor.normalizedTitle(context.title)),context.sessionToken]);
@@ -841 +802 @@
 };
 
-// MediaWikiAdaptor.prototype.putTiddler not supported
-MediaWikiAdaptor.prototype.close = function()
-{
-        return true;
-};
-
 config.adaptors[MediaWikiAdaptor.serverType] = MediaWikiAdaptor;
 } // end of 'install only once'