Merge branch 'master' into greenkeeper/i18next-10.6.0

.gitignore

@@ -1,9 +1,10 @@
-# ignore downloaded dependencies
+# dependencies
 node_modules
 bower_components
 
-# ignore build
+# build
 build
 
-# ignore test viewer
-/viewer
+# misc
+npm-debug.log
+yarn-error.log

.travis.yml

@@ -10,7 +10,15 @@ env:
   global:
     - secure: jWTxnnLGmoM+j3148tIF2SJMEyub2j9kmR15vEKVeP6BbUvNgWH9jTSwf6Ddv3qjbAb3D8p9nhYBOZgRub1stwjWCH+DS17AoKFeRVj4Q8Sf0XBHGzJbn0FkstilVmGv3Zr/FVmDSEm1xSSHanWCUQX0uH9r/XB8z7khp4pLryo=
 
-# update gh-pages if all good
+# greenkeeper lock file
+before_install: yarn global add greenkeeper-lockfile@1
+before_script: greenkeeper-lockfile-update
+after_script: greenkeeper-lockfile-upload
+
 after_success:
-  - chmod +x ./resources/scripts/update-gh-pages.sh
-  - ./resources/scripts/update-gh-pages.sh
+# send coverage to coveralls
+- grunt coveralls
+# update gh-page only for master and not pull requests
+- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+    chmod +x ./resources/scripts/update-gh-pages.sh; "./resources/scripts/update-gh-pages.sh";
+  else echo "Not deploying artifacts for $TRAVIS_BRANCH"; fi

Gruntfile.js

@@ -67,6 +67,8 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-jsdoc');
 
-    // Task to run tests
-    grunt.registerTask('publish', ['jshint', 'qunit', 'coveralls', 'concat', 'uglify', 'jsdoc']);
+    // tasks
+    grunt.registerTask('test', ['jshint', 'qunit']);
+    grunt.registerTask('build', ['concat', 'uglify']);
+    grunt.registerTask('doc', ['jsdoc']);
 };

dist/dwv.js

@@ -3040,7 +3040,7 @@ dwv.dicom = dwv.dicom || {};
  * Get the version of the library.
  * @return {String} The version of the library.
  */
-dwv.getVersion = function () { return "0.23.2"; };
+dwv.getVersion = function () { return "0.23.3"; };
 
 /**
  * Clean string: trim and remove ending.
@@ -25028,6 +25028,22 @@ var dwv = dwv || {};
 /** @namespace */
 dwv.browser = dwv.browser || {};
 
+/**
+ * Local function to ask Modernizr if a property is supported.
+ * @parma {String} property The property to test.
+ */
+function askModernizr( property ) {
+    if ( typeof dwv.Modernizr === "undefined" ) {
+        dwv.ModernizrInit(window, document);
+    }
+    var props = property.split('.');
+    var prop = dwv.Modernizr;
+    for ( var i = 0; i < props.length; ++i ) {
+        prop = prop[props[i]];
+    }
+    return prop;
+}
+
 /**
  * Browser check for the FileAPI.
  * Assume support for Safari5.
@@ -25045,16 +25061,17 @@ dwv.browser.hasFileApi = function()
         return true;
     }
     // regular test
-    return dwv.Modernizr.filereader;
+    return askModernizr("filereader");
 };
 
 /**
  * Browser check for the XMLHttpRequest.
  */
 dwv.browser.hasXmlHttpRequest = function()
 {
-    return dwv.Modernizr.xhrresponsetype &&
-        dwv.Modernizr.xhrresponsetypearraybuffer && dwv.Modernizr.xhrresponsetypetext &&
+    return askModernizr("xhrresponsetype") &&
+        askModernizr("xhrresponsetypearraybuffer") &&
+        askModernizr("xhrresponsetypetext") &&
         "XMLHttpRequest" in window && "withCredentials" in new XMLHttpRequest();
 };
 
@@ -25063,7 +25080,7 @@ dwv.browser.hasXmlHttpRequest = function()
  */
 dwv.browser.hasTypedArray = function()
 {
-    return dwv.Modernizr.dataview && dwv.Modernizr.typedarrays;
+    return askModernizr("dataview") && askModernizr("typedarrays");
 };
 
 /**
@@ -25072,7 +25089,7 @@ dwv.browser.hasTypedArray = function()
  */
 dwv.browser.hasInputColor = function()
 {
-    return dwv.Modernizr.inputtypes.color;
+    return askModernizr("inputtypes.color");
 };
 
 /**
@@ -25081,7 +25098,7 @@ dwv.browser.hasInputColor = function()
  */
 dwv.browser.hasInputDirectory = function()
 {
-    return dwv.Modernizr.fileinputdirectory;
+    return askModernizr("fileinputdirectory");
 };
 
 
@@ -25488,7 +25505,8 @@ var dwv = dwv || {};
  * of control over the experience.
 */
 
-;(function(window, document, undefined){
+dwv.ModernizrInit = function (window, document, undefined) {
+//;(function(window, document, undefined){
   var tests = [];
 
 
@@ -26075,7 +26093,8 @@ file selection dialog.
 
 ;
 
-})(window, document);
+//})(window, document);
+};
 
 // namespaces
 var dwv = dwv || {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dwv",
-  "version": "0.23.2",
+  "version": "0.24.0-beta",
   "description": "DICOM Web Viewer.",
   "keywords": [
     "DICOM",
@@ -17,25 +17,29 @@
   "main": "dist/dwv.min.js",
   "dependencies": {
     "i18next": "~10.6.0",
-    "i18next-xhr-backend": "~1.5.1",
     "i18next-browser-languagedetector": "~2.1.0",
+    "i18next-xhr-backend": "~1.5.1",
     "jszip": "~3.1.3",
     "konva": "~1.7.3",
     "magic-wand-js": "~1.0.0"
   },
   "devDependencies": {
-    "qunit": "~2.5.1",
     "grunt": "~1.0.1",
     "grunt-cli": "~1.2",
-    "grunt-contrib-jshint": "~1.1.0",
-    "grunt-qunit-istanbul": "~1.0.0",
-    "grunt-coveralls": "~1.0",
     "grunt-contrib-concat": "~1.0",
+    "grunt-contrib-jshint": "~1.1.0",
     "grunt-contrib-uglify": "~3.3.0",
+    "grunt-coveralls": "~2.0.0",
     "grunt-jsdoc": "~2.2.0",
-    "ink-docstrap": "~1.3"
+    "grunt-qunit-istanbul": "~1.0.0",
+    "http-server": "^0.11.1",
+    "ink-docstrap": "~1.3",
+    "qunit": "~2.6.0"
   },
   "scripts": {
-    "test": "grunt publish --verbose"
+    "start": "http-server",
+    "test": "grunt test --verbose",
+    "build": "grunt build --verbose",
+    "doc": "grunt doc --verbose"
   }
 }