Merge pull request #19 from kind-hearted/master

Not work, need to update phantomjs

Author: fouber

index.js

@@ -9,7 +9,7 @@ var PHANTOMJS_SCRIPT_DIR = path.join(__dirname, 'phantomjs');
 var PHANTOMJS_SCRIPT_FILE = path.join(PHANTOMJS_SCRIPT_DIR, 'index.js');
 var _ = require('./util.js');
 var _exists = fs.existsSync || path.existsSync;
-var phantomjs = require('phantomjs');
+var phantomjs = require('phantomjs-prebuilt');
 var binPath = phantomjs.path;
 
 /**

package.json

@@ -13,7 +13,7 @@
         "diff"
     ],
     "dependencies": {
-        "phantomjs": "~1.9.16"
+        "phantomjs-prebuilt": "^2.1.14"
     },
     "repository": {
         "type": "git",

phantomjs/index.js

@@ -331,11 +331,12 @@ M.prototype.highlight = function(left, right, diff, lOffset, rOffset, callback){
     log('diff [' + left + '] width [' + right + ']');
     log('has [' + diff.length + '] changes');
     var render = this.getRenderOptions();
-    var lScreenshot = this.root + '/' + left + '/' + SCREENSHOT_FILENAME + '.' + render.ext;
-    var rScreenshot = this.root + '/' + right + '/' + SCREENSHOT_FILENAME + '.' + render.ext;
+    var protocol = 'file://' + (IS_WIN ? '/' : '');
+    var lScreenshot = protocol + this.root + '/' + left + '/' + SCREENSHOT_FILENAME + '.' + render.ext;
+    var rScreenshot = protocol + this.root + '/' + right + '/' + SCREENSHOT_FILENAME + '.' + render.ext;
     var dScreenshot = this.root + '/diff/' + left + '-' + right + '.' + render.ext;
     var html = phantom.libraryPath + '/' + HIGHLIGHT_HTML_FILENAME;
-    var url = 'file://' + (IS_WIN ? '/' : '') + html + '?';
+    var url = protocol + html + '?';
     var opt = {
         page : {
             settings: {