Merge branch 'develop'

Author: danielweck

.gitignore

@@ -8,9 +8,9 @@ node_modules
 .surgeignore
 epub_content/x
 build.txt
-local_test_data
 npm-debug.log
 http.log
 http_ebooks.log
 http_app.log
 http_app-ebooks.log
+

.vscode/settings.json

@@ -31,7 +31,7 @@
 
     "editor.roundedSelection": false,
 
-    "editor.wrappingColumn": 0,
+    "editor.wordWrap": "off",
 
     "editor.quickSuggestions": false,
 
@@ -47,7 +47,7 @@
 
     "editor.folding": false,
 
-    "editor.renderWhitespace": true,
+    "editor.renderWhitespace": "all",
 
-    "editor.tabSize": "4"
+    "editor.tabSize": 4
 }

build-config/selenium_webdriver.js

@@ -39,6 +39,10 @@ child.on('exit', function() {
             {encoding: 'utf-8'},
             function(err, fileContents) {
                 if (!err) {
+
+                    // See https://github.com/readium/readium-js-viewer/issues/566
+                    // fileContents = fileContents.replace("// installed as module or locally?", "if (true) { } else ");
+                    
                     var func = eval("( function(){"+fileContents+"; return {start: start, stop: stop}; } )");
                     var api = func();
 

package.json

@@ -5,7 +5,7 @@
   "._": "as this would overwrite / update the JSON, not the master CSON!",
   "*/": "----------------------------------------------------------------------------",
   "name": "readium-js-viewer",
-  "version": "0.25.0",
+  "version": "0.26.0-alpha",
   "engines": {
     "node": ">=0.12",
     "npm": ">2.10"
@@ -70,7 +70,7 @@
     "mocha": "latest",
     "wd": "latest",
     "phantomjs-prebuilt": "latest",
-    "grunt-selenium-webdriver": "latest",
+    "grunt-selenium-webdriver": "levexis/grunt-selenium-webdriver",
     "crx": "latest",
     "chai": "latest",
     "chai-as-promised": "latest",

package/package_base.cson

@@ -42,7 +42,7 @@
 
 name: "readium-js-viewer"
 
-version: "0.25.0"
+version: "0.26.0-alpha"
 
 engines:
     node: ">=0.12"
@@ -178,7 +178,7 @@ devDependencies:
     "phantomjs-prebuilt": 'latest'
 
     #"grunt": 'latest'
-    "grunt-selenium-webdriver": 'latest'
+    "grunt-selenium-webdriver": 'levexis/grunt-selenium-webdriver'
     #"selenium-webdriver": 'latest'
 
     "crx": 'latest'

readium-js

@@ -20,7 +20,7 @@ <h4 class="modal-title" id="settings-label">{{strings.settings}}</h4>
                 <div id="tab-style" class="tab-pane active" role="tabpanel" aria-expanded="true">
                 <h5 aria-hidden="true">{{strings.preview}}</h5>
                 <div  aria-hidden="true" class="row">
-                    <div data-theme="default-theme" class="col-xs-10 col-xs-offset-1 preview-text default-theme">
+                    <div data-theme="author-theme" class="col-xs-10 col-xs-offset-1 preview-text author-theme">
                         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus neque dui, congue a suscipit non, feugiat eu urna. Cras in felis sed orci aliquam sagittis.
                     </div>
                 </div>