From 7232520f83671dccfdbaf28e0abf180307c34cd7 Mon Sep 17 00:00:00 2001 From: ZhengHuaYu Date: Wed, 28 Jun 2017 10:54:10 +0800 Subject: [PATCH] change phantomjs to phantomjs-prebuild. add protocol in highlight. --- index.js | 2 +- package.json | 2 +- phantomjs/index.js | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index b035a3d..1408d6e 100644 --- a/index.js +++ b/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; /** diff --git a/package.json b/package.json index 721b83b..964a34b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "diff" ], "dependencies": { - "phantomjs": "~1.9.16" + "phantomjs-prebuilt": "^2.1.14" }, "repository": { "type": "git", diff --git a/phantomjs/index.js b/phantomjs/index.js index 2abfeae..3008da1 100644 --- a/phantomjs/index.js +++ b/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: {