From 61061e58bb88a6d40bf5b1522cd8e2cd6f8f33bc Mon Sep 17 00:00:00 2001 From: mistic100 Date: Wed, 7 Mar 2018 18:39:19 +0100 Subject: [PATCH 1/2] Fix #182 Remove postinstall script --- .travis.yml | 2 ++ package.json | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aeaba4edc..b1a3cce54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,3 +4,5 @@ node_js: before_install: - npm install -g grunt-cli - npm install -g bower +before_script: + - bower install diff --git a/package.json b/package.json index fbb659c7c..eb9ef7bcd 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "url": "git://github.com/mistic100/Photo-Sphere-Viewer.git" }, "scripts": { - "postinstall": "bower install", "test": "grunt test", "start": "grunt serve" } From a607ff2d095e670cc87bcab884e02a8b545e5f93 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Wed, 7 Mar 2018 18:43:20 +0100 Subject: [PATCH 2/2] Close #66 Remove autoload option --- package.json | 2 +- src/js/PhotoSphereViewer.defaults.js | 1 - src/js/PhotoSphereViewer.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index eb9ef7bcd..796d21aa7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photo-sphere-viewer", - "version": "3.3.0-SNAPSHOT", + "version": "3.4.0-SNAPSHOT", "authors": [ { "name": "Jérémy Heleine", diff --git a/src/js/PhotoSphereViewer.defaults.js b/src/js/PhotoSphereViewer.defaults.js index 24d6620da..4cc5cb889 100644 --- a/src/js/PhotoSphereViewer.defaults.js +++ b/src/js/PhotoSphereViewer.defaults.js @@ -121,7 +121,6 @@ PhotoSphereViewer.DEFAULTS = { panorama: null, container: null, caption: null, - autoload: true, usexmpdata: true, pano_data: null, webgl: true, diff --git a/src/js/PhotoSphereViewer.js b/src/js/PhotoSphereViewer.js index 56438e4df..84b1130a5 100644 --- a/src/js/PhotoSphereViewer.js +++ b/src/js/PhotoSphereViewer.js @@ -444,7 +444,7 @@ function PhotoSphereViewer(options) { this._bindEvents(); // load panorama - if (this.config.autoload) { + if (this.config.panorama) { this.load(); }