version bump to 0.25.0

Author: danielweck

.travis.yml

@@ -4,7 +4,7 @@ branches:
   - develop
 language: node_js
 node_js:
-- '4.2'
+- '6'
 before_install:
 - git submodule update --init --recursive
 #
@@ -99,7 +99,7 @@ env:
   - SAUCE_USERNAME=readium
   - SAUCE_ACCESS_KEY=a36ebc10-e514-4da6-924c-307aec513550
   - USE_SAUCE=true
-  - secure: onYFok5CBcV1116+kOEZJsyDB1kRHF+8deU1cll3vhxBEM/woSRvpso32oxjuza+or2uXuBT1SiZn0oTmuKD/TRaKw1e8wTtX6kQzCUhyeGoAyJH8SeGIwkt8+x232rFUe2bNLr6e0JAGZMtTjk1Q1zqfONNWAQzsUWDeUqvwt8=
+  - secure: nwpNZad60c5GglOpnesV6sggzsbCIbLg1ORHB2s347g3tIu3a7evbbToaDD/tsnnZsLHdR71hypCECRFMDORcmkx144lWRlquiGtvIcNb86jAR//QQtzLekFly9UAN6ublG0g5lvdjvBwxlPF1Jig+OMNR95BsnUxbmA8b5guIM=
   matrix:
   - MODE=chromeApp
   - MODE=firefox

README.md

@@ -19,8 +19,8 @@ See [license.txt](./license.txt).
 
 ## Prerequisites
 
-* A decent terminal. On Windows, GitShell works great ( http://git-scm.com ), GitBash works too ( https://msysgit.github.io ), and Cygwin adds useful commands ( https://www.cygwin.com ).
-* NodeJS ( https://nodejs.org ) **v4** (but not v5, because the installer ships with NPM v3 which seems to [have bugs](https://github.com/readium/readium-js-viewer/issues/453) related to the new flat module dependencies)
+* A decent terminal. On Windows, GitBash works great ( https://msysgit.github.io or https://git-for-windows.github.io or https://git-scm.com/download/win ), and optionally Cygwin adds useful commands ( https://www.cygwin.com ).
+* NodeJS ( https://nodejs.org ) **v4+** (Note that NodeJS v6+ and NPM v3+ are now supported)
 
 
 ## Development

build-config/deployCrx.js

@@ -9,7 +9,6 @@ if (versionJson.readiumJsViewer.branch !== "develop") {
     return;
 }
 
-
 if (!process.env.GITHUB_TOKEN)//process.env.MODE == 'chromeApp')
 {
     console.log("process.env.GITHUB_TOKEN not defined => skipping upload CRX, etc. to GitHub release.");
@@ -21,7 +20,10 @@ var repo = 'readium-js-viewer';
 
 console.log('deploying crx to github');
 
+// https://mikedeboer.github.io/node-github
+// https://developer.github.com/v3/git/
 var GitHubApi = require("github");
+
 var https = require('https');
 
 var github = new GitHubApi({
@@ -37,7 +39,7 @@ var version = packageObj.version;
 var oauthToken = process.env.GITHUB_TOKEN;
 github.authenticate({
     type: "oauth",
-    token: oauthToken//process.env.GITHUB_TOKEN
+    token: oauthToken
 });
 
 var deleteOldRelease = function(error, response){
@@ -46,15 +48,15 @@ var deleteOldRelease = function(error, response){
         return;
     }
 
-    github.repos.getReleases({user: owner, repo: repo}, function(error, releases){
+    github.repos.getReleases({owner: owner, repo: repo}, function(error, releases){
         for (var i = 0; i < releases.length; i++){
             if (releases[i].tag_name == version){
                 break;
             }
         }
         if (i < releases.length){
             console.log('found existing release, deleting');
-            github.repos.deleteRelease({user: owner, repo: repo, id: releases[i].id}, function(error, response){
+            github.repos.deleteRelease({owner: owner, repo: repo, id: releases[i].id}, function(error, response){
                 if (error){
                     console.error(JSON.stringify(error));
                     return;
@@ -131,7 +133,7 @@ var createRelease = function(){
     var releaseData = {
         tag_name: version,
         //target_commitish: process.env.TRAVIS_COMMIT,
-        user: owner,
+        owner: owner,
         repo: repo,
         name: releaseTitle,
         body: releaseDescription,
@@ -168,22 +170,40 @@ var createRelease = function(){
 };
 
 var tagRef = {
-    user: owner,
+    owner: owner,
     repo: repo,
     ref: 'tags/' + version
 };
 
-github.gitdata.getReference(tagRef, function(error, result){
+github.gitdata.getReference(tagRef, function(error, result) {
 
-    var func;
     tagRef.sha = process.env.TRAVIS_COMMIT;
-    if (error){
-        console.log(version + ' tag does not exist, creating.');
+
+    if (error) {
+        //console.error(JSON.stringify(error));
+
         tagRef.ref = 'refs/' + tagRef.ref;
+
+        console.log(version + ' tag does not exist, creating.');
         github.gitdata.createReference(tagRef, deleteOldRelease);
     }
-    else{
-        console.log('updating previous "' + version + '" release tag');
-        github.gitdata.updateReference(tagRef, deleteOldRelease);
+    else {
+        //console.log(JSON.stringify(result));
+
+        //console.log('updating previous "' + version + '" release tag');
+        //github.gitdata.updateReference(tagRef, deleteOldRelease);
+
+        console.log('deleting previous "' + version + '" release tag');
+        github.gitdata.deleteReference(tagRef, function(error, response) {
+            if (error){
+                console.error(JSON.stringify(error));
+                return;
+            }
+
+            tagRef.ref = 'refs/' + tagRef.ref;
+
+            console.log(version + ' tag re-creating.');
+            github.gitdata.createReference(tagRef, deleteOldRelease);
+        });
     }
 });

dev/RequireJS_config.js

@@ -60,6 +60,11 @@ var getURLQueryParams = function() {
 
 var urlParams = getURLQueryParams();
 
+var fontsArray = [];
+if (typeof getFontFaces != "undefined") { // defined externally
+    fontsArray = getFontFaces(HTTPServerRootFolder + "/src/fonts/");
+}
+
 // MUST BE *SINGLE* CALL TO require.config() FOR ALMOND (SINGLE BUNDLE) TO WORK CORRECTLY!!!
 require.config({
     /* http://requirejs.org/docs/api.html#config-waitSeconds */
@@ -71,6 +76,8 @@ require.config({
 
             'mathJaxUrl': HTTPServerRootFolder + '/node_modules/mathjax-single-file/dist/MMLSVG/MathJax.js',
 
+            'fonts': fontsArray,
+
             'annotationCSSUrl': HTTPServerRootFolder + '/src/css/annotations.css',
 
             'jsLibRoot': HTTPServerRootFolder + '/readium-js/node_modules/zip-js/WebContent/',

dev/index_RequireJS_multiple-bundles.html

@@ -86,6 +86,8 @@
 
 
 
+<script type="text/javascript" src="../src/fonts/fonts.js"> </script>
+
 <script type="text/javascript" src="./RequireJS_config.js"> </script>
 
 <script type="text/javascript">

dev/index_RequireJS_multiple-bundles_LITE.html

@@ -75,6 +75,8 @@
 
 
 
+<script type="text/javascript" src="../src/fonts/fonts.js"> </script>
+
 <script type="text/javascript" src="./RequireJS_config.js"> </script>
 
 <script type="text/javascript">

dev/index_RequireJS_no-optimize.html

@@ -47,6 +47,9 @@
 
 <script type="text/javascript" src="../readium-js/readium-shared-js/build-config/RequireJS_config_plugins.js"> </script>
 
+
+<script type="text/javascript" src="../src/fonts/fonts.js"> </script>
+
 <script type="text/javascript" src="./RequireJS_config.js"> </script>
 
 

dev/index_RequireJS_no-optimize_LITE.html

@@ -34,7 +34,10 @@
 
     <script type="text/javascript" src="../readium-js/readium-shared-js/build-config/RequireJS_config_plugins.js"> </script>
 
-    <script type="text/javascript" src="./RequireJS_config.js"> </script>
+
+<script type="text/javascript" src="../src/fonts/fonts.js"> </script>
+
+<script type="text/javascript" src="./RequireJS_config.js"> </script>
 
 
 <script type="text/javascript">

dev/index_RequireJS_single-bundle.html

@@ -37,6 +37,8 @@
 
     <script type="text/javascript" src="../build-output/_single-bundle/readium-js-viewer_all.js"> </script>
 
+<script type="text/javascript" src="../src/fonts/fonts.js"> </script>
+
 <script type="text/javascript" src="./RequireJS_config.js"> </script>
 
     </head>

dev/index_RequireJS_single-bundle_LITE.html

@@ -25,6 +25,9 @@
 
     <script type="text/javascript" src="../build-output/_single-bundle/readium-js-viewer_all_LITE.js"> </script>
 
+
+<script type="text/javascript" src="../src/fonts/fonts.js"> </script>
+
 <script type="text/javascript" src="./RequireJS_config.js"> </script>
 
     </head>