Merge branch 'v0.25'

ivmartel · Oct 8, 2018 · 9591239 · 9591239
2 parents a9a2d12 + 9b46341
commit 9591239
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/dist/dwv.js b/dist/dwv.js
@@ -1,4 +1,4 @@
-/*! dwv 0.25.1 2018-10-04 23:08:54 */
+/*! dwv 0.25.2 2018-10-08 23:41:22 */
 // Inspired from umdjs
 // See https://github.com/umdjs/umd/blob/master/templates/returnExports.js
 (function (root, factory) {
@@ -423,7 +423,8 @@ dwv.App = function ()
      * @return {width, height} The width and height of the div.
      */
     this.getLayerContainerSize = function () {
-      var div = document.getElementById(containerDivId);
+      var ldiv = self.getElement("layerContainer");
+      var div = ldiv.parentNode;
       // remove the height of other elements of the container div
       var height = div.offsetHeight;
       var kids = div.children;
@@ -3598,7 +3599,7 @@ dwv.dicom = dwv.dicom || {};
  * Get the version of the library.
  * @return {String} The version of the library.
  */
-dwv.getVersion = function () { return "0.25.1"; };
+dwv.getVersion = function () { return "0.25.2"; };
 
 /**
  * Clean string: trim and remove ending.

diff --git a/dist/dwv.min.js b/dist/dwv.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dwv",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "description": "DICOM Web Viewer.",
   "keywords": [
     "DICOM",

diff --git a/src/app/application.js b/src/app/application.js
@@ -364,7 +364,8 @@ dwv.App = function ()
      * @return {width, height} The width and height of the div.
      */
     this.getLayerContainerSize = function () {
-      var div = document.getElementById(containerDivId);
+      var ldiv = self.getElement("layerContainer");
+      var div = ldiv.parentNode;
       // remove the height of other elements of the container div
       var height = div.offsetHeight;
       var kids = div.children;

diff --git a/src/dicom/dicomParser.js b/src/dicom/dicomParser.js
@@ -7,7 +7,7 @@ dwv.dicom = dwv.dicom || {};
  * Get the version of the library.
  * @return {String} The version of the library.
  */
-dwv.getVersion = function () { return "0.25.1"; };
+dwv.getVersion = function () { return "0.25.2"; };
 
 /**
  * Clean string: trim and remove ending.