Couple of bug fixes and release for 2.1.0

Author: sdesmond46

.gitignore

@@ -1,4 +1,5 @@
 *~
 node_modules
 .DS_Store
-*.log
+*.log
+dist

DevUtils/BuildAndCopy.js

@@ -101,9 +101,11 @@ SimulatorDispatcher.prototype._getPayloadObj = function(payloadString) {
 }
 
 SimulatorDispatcher.prototype._getWebSecurityWarningConfirm = function() {
-  var hostName = this._sourceWindow.location.hostname;
+  // Due to cross-origin security issues over https, we may not be able to retrieve _sourceWindow.
+  // Use sourceOrigin instead.
+  var hostName = this._sourceOrigin || this._sourceWindow.location.origin;
 
-  var supportedHosts = ["localhost", "tableau.github.io"];
+  var supportedHosts = ["http://localhost", "https://localhost", "http://tableau.github.io", "https://tableau.github.io"];
   if (supportedHosts.indexOf(hostName) >= 0) {
       return true;
   }
@@ -172,7 +174,8 @@ SimulatorDispatcher.prototype._receiveMessage = function(evt) {
   if(!payloadObj) return; // This message is not needed for WDC
 
   if (!this._sourceWindow) {
-    this._sourceWindow = evt.source
+    this._sourceWindow = evt.source;
+    this._sourceOrigin = evt.origin;
   }
 
   var msgData = payloadObj.msgData;
@@ -232,7 +235,7 @@ SimulatorDispatcher.prototype._addCrossOriginException = function(destOriginList
   console.log("Cross Origin Exception requested in the simulator. Pretending to work.")
   setTimeout(function() {
     this.globalObj._wdc.addCrossOriginExceptionCompleted(destOriginList);
-  }, 0);
+  }.bind(this), 0);
 }
 
 SimulatorDispatcher.prototype._log = function(msg) {

SimulatorDispatcher.js

@@ -14,14 +14,17 @@ function Table(tableInfo, incrementValue, dataCallbackFn) {
 
   /** @private */
   this._dataCallbackFn = dataCallbackFn;
+
+  // bind the public facing version of this function so it can be passed around
+  this.appendRows = this._appendRows.bind(this);
 }
 
 /**
 * @method appends the given rows to the set of data contained in this table
 * @param data {array} - Either an array of arrays or an array of objects which represent
 * the individual rows of data to append to this table
 */
-Table.prototype.appendRows = function(data) {
+Table.prototype._appendRows = function(data) {
   // Do some quick validation that this data is the format we expect
   if (!data) {
     console.warn("rows data is null or undefined");

Table.js

@@ -2,23 +2,11 @@
 var program = require('commander');
 var BuildNumber = require('./DevUtils/BuildNumber.js');
 var execSync = require('child_process').execSync;
-var fs = require('fs.extra');
+var fs = require('fs-extra');
 var path = require('path');
 
 // wrap everything in a try catch so we can log any errors we see
 try {
-  program
-    .option('-v, --versionNumber <versionNumber>', 'What version of the shim you are producing')
-    .parse(process.argv);
-
-  if (program.versionNumber) {
-    console.log("Requesting to make version " + program.versionNumber);
-    var version = new BuildNumber.VersionNumber(program.versionNumber);
-    console.log("Parsed version is " + version.toString());
-    console.log("Overriding version number to " + program.versionNumber);
-    execSync("npm config set wdclib:versionNumber " + program.versionNumber);
-  }
-
   console.log("Running build");
   execSync('npm run-script build');
 
@@ -27,7 +15,8 @@ try {
 
   console.log("Done runing build processes");
 
-  var buildNumber = BuildNumber.getBuildNumber();
+  // Copying files over
+  var buildNumber = new BuildNumber.VersionNumber(BuildNumber.getBuildNumber());
 
   // Build up the names for the regular and minified versions of the file
   var newFullFileName = BuildNumber.WDC_LIB_PREFIX + buildNumber.toString() + ".js";
@@ -45,6 +34,7 @@ try {
     {src: "bundle.min.js", dest: newLatestMinFileName},
   ];
 
+  // Go through and copy all the files
   for(var pair of copyPairs) {
     var srcPath = path.join(__dirname, ".", "dist", pair.src);
     var dstPath = path.join(__dirname, '.', 'versions', pair.dest);
@@ -53,16 +43,10 @@ try {
     fs.copySync(srcPath, dstPath);
   }
 
-
 } catch(e) {
   debugger;
   console.error("Error encountered");
   console.error(e.toString());
-} finally {
-  // Make sure we clear out the overriden version at the end
-  if (!!program.versionNumber) {
-    execSync('npm config rm wdclib:versionNumber');
-  }
 }
 
 

dist/bundle.js

@@ -5,7 +5,7 @@
     "build": "webpack --config webpack.config.js --progress --profile --colors",
     "build_min": "webpack --config webpack-production.config.js --progress --profile --colors",
     "build_and_copy": "node DevUtils/BuildAndCopy.js",
-    "make_version" : "node ./make_version.js"
+    "make_version": "node ./make_version.js"
   },
   "main": "ShimLibrary.js",
   "private": true,
@@ -16,10 +16,11 @@
   },
   "dependencies": {
     "commander": "^2.9.0",
+    "fs-extra": "^0.30.0",
     "json-loader": "^0.5.4",
     "qwebchannel": "^5.5.0"
   },
-  "config" : { 
-    "versionNumber" : "2.1.1" 
+  "config": {
+    "versionNumber": "2.1.0"
   }
 }