From: Mike Taylor <mike@indexdata.com>
Date: Fri, 24 Jan 2014 11:32:33 +0000 (+0000)
Subject: Pass context.windowid (in most situations) instead of this.windowid
X-Git-Tag: v1.6.39~16^2
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=ae79789f61623d9a3e5a62a4321f6107f416c845;p=pazpar2-moved-to-github.git

Pass context.windowid (in most situations) instead of this.windowid
JavaScript `this', from Hell's heart I stab at thee!
---

diff --git a/js/pz2.js b/js/pz2.js
index a799b40..59c501d 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -215,7 +215,7 @@ pz2.prototype =
                                 context.keepAlive
                             );
                         if ( context.initCallback )
-                            context.initCallback(this.windowid);
+                            context.initCallback(context.windowid);
                     }
                     else
                         context.throwError('Init failed. Malformed WS resonse.',
@@ -241,7 +241,7 @@ pz2.prototype =
 
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
         request.safeGet(
-            { "command": "ping", "session": this.sessionID, "windowid" : this.windowid },
+            { "command": "ping", "session": this.sessionID, "windowid" : context.windowid },
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
                         .childNodes[0].nodeValue == "OK" ) {
@@ -344,7 +344,7 @@ pz2.prototype =
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
         request.safeGet(
-            { "command": "stat", "session": this.sessionID, "windowid" : this.windowid },
+            { "command": "stat", "session": this.sessionID, "windowid" : context.windowid },
             function(data) {
                 if ( data.getElementsByTagName("stat") ) {
                     var activeClients = 
@@ -366,7 +366,7 @@ pz2.prototype =
                                 },
                                 delay
                             );
-                    context.statCallback(stat, this.windowid);
+                    context.statCallback(stat, context.windowid);
                 }
                 else
                     context.throwError('Stat failed. Malformed WS resonse.',
@@ -472,7 +472,7 @@ pz2.prototype =
                   context.show();
                 }, 
                 delay);
-              context.showCallback(show, this.windowid);
+              context.showCallback(show, context.windowid);
           }
         );
     },
@@ -524,7 +524,7 @@ pz2.prototype =
                     record = new Array();
                     record['xmlDoc'] = data;
                     record['offset'] = context.currRecOffset;
-                    callback(record, args, this.windowid);
+                    callback(record, args, context.windowid);
                 //pz2 record
                 } else if ( recordNode = 
                     data.getElementsByTagName("record")[0] ) {
@@ -554,7 +554,7 @@ pz2.prototype =
                                   },
                                   delay
                                );                                    
-                    callback(record, args, this.windowid);
+                    callback(record, args, context.windowid);
                 }
                 else
                     context.throwError('Record failed. Malformed WS resonse.',
@@ -643,7 +643,7 @@ pz2.prototype =
                                 delay
                             );
                    
-                    context.termlistCallback(termList, this.windowid);
+                    context.termlistCallback(termList, context.windowid);
                 }
                 else
                     context.throwError('Termlist failed. Malformed WS resonse.',
@@ -732,7 +732,7 @@ pz2.prototype =
                                 delay
                             );
 
-                    context.bytargetCallback(bytarget, this.windowid);
+                    context.bytargetCallback(bytarget, context.windowid);
                 }
                 else
                     context.throwError('Bytarget failed. Malformed WS resonse.',