fix for version in path of library

tunapanda · May 10, 2018 · 67a1991 · 67a1991
1 parent c4229f4
commit 67a1991
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# h5p-standalone 1.3.3
+# h5p-standalone 1.3.4
 Display H5P content with plain old HTML
 
 ## Usage

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "h5p-standalone",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "homepage": "https://github.com/tunapanda/h5p-standalone",
   "authors": [
     "Jake Lee Kennedy <jake@tunapanda.org>"

diff --git a/dist/js/h5p-standalone-frame.js b/dist/js/h5p-standalone-frame.js
@@ -12612,6 +12612,9 @@ H5P.createTitle = function (rawTitle, maxLength) {
 })(H5P.jQuery);
 
 H5P.getLibraryPath = function (library) {
+  if (H5PIntegration.pathIncludesVersion) {
+    return H5PIntegration.url + '/' + library;
+  } 
   return H5PIntegration.url + '/' + library.split('-')[0];
 };
 
@@ -12641,4 +12644,4 @@ H5P.getPath = function (path, contentId) {
   // }
 
   return prefix + '/' + path;
-};
+};
diff --git a/dist/js/h5p-standalone-frame.min.js b/dist/js/h5p-standalone-frame.min.js
diff --git a/dist/js/h5p-standalone-main.js b/dist/js/h5p-standalone-main.js
@@ -10025,6 +10025,7 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
     };
 
     var getLibrary = checklibraryPath.then(function (h5p) {
+      H5PIntegration.pathIncludesVersion = h5p.pathIncludesVersion;
       var mainLibrary = h5p.preloadedDependencies.find(function (dep) {
         return dep.machineName === h5p.mainLibrary;
       });
@@ -10116,16 +10117,7 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
 
     H5PIntegration.core = {
       styles: [frameCss],
-      scripts: [frameJs
-      // 'bower_components/jquery/dist/jquery.js',
-      // 'lib/js/h5p-jquery.js',
-      // 'bower_components/h5p-php-library/js/h5p-content-type.js',
-      // 'bower_components/h5p-php-library/js/h5p-event-dispatcher.js',
-      // 'bower_components/h5p-php-library/js/h5p-x-api-event.js',
-      // 'bower_components/h5p-php-library/js/h5p-x-api.js',
-      // 'bower_components/h5p-php-library/js/h5p.js',
-      // 'lib/js/h5p-overwrite.js'
-      ]
+      scripts: [frameJs]
     };
 
     H5PIntegration.init(id, h5pContent, displayOptions);
@@ -13044,6 +13036,9 @@ H5P.createTitle = function (rawTitle, maxLength) {
 })(H5P.jQuery);
 
 H5P.getLibraryPath = function (library) {
+  if (H5PIntegration.pathIncludesVersion) {
+    return H5PIntegration.url + '/' + library;
+  } 
   return H5PIntegration.url + '/' + library.split('-')[0];
 };
 
@@ -13073,4 +13068,4 @@ H5P.getPath = function (path, contentId) {
   // }
 
   return prefix + '/' + path;
-};
+};
diff --git a/dist/js/h5p-standalone-main.min.js b/dist/js/h5p-standalone-main.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "h5p-standalone",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Display H5P content as standalone frontend code, no server needed.",
   "main": "dist/js/h5p-standalone-main.min.js",
   "dependencies": {

diff --git a/src/js/h5p-overwrite.js b/src/js/h5p-overwrite.js
@@ -1,4 +1,7 @@
 H5P.getLibraryPath = function (library) {
+  if (H5PIntegration.pathIncludesVersion) {
+    return H5PIntegration.url + '/' + library;
+  } 
   return H5PIntegration.url + '/' + library.split('-')[0];
 };
 

diff --git a/src/js/h5pintegration.es6 b/src/js/h5pintegration.es6
@@ -129,6 +129,7 @@
   }
 
   let getLibrary = checklibraryPath.then(function (h5p) {
+    H5PIntegration.pathIncludesVersion = h5p.pathIncludesVersion;
     let mainLibrary = h5p.preloadedDependencies.find(dep => dep.machineName ===  h5p.mainLibrary);
     let mainLibraryPath = h5p.mainLibrary + (h5p.pathIncludesVersion ? "-" + mainLibrary.majorVersion + "." + mainLibrary.minorVersion : '');
     return getJSONPromise(`${pathToContent}/${mainLibraryPath}/library.json`);

diff --git a/src/js/h5pintegration.js b/src/js/h5pintegration.js
@@ -143,6 +143,7 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
     };
 
     var getLibrary = checklibraryPath.then(function (h5p) {
+      H5PIntegration.pathIncludesVersion = h5p.pathIncludesVersion;
       var mainLibrary = h5p.preloadedDependencies.find(function (dep) {
         return dep.machineName === h5p.mainLibrary;
       });
@@ -234,16 +235,7 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
 
     H5PIntegration.core = {
       styles: [frameCss],
-      scripts: [frameJs
-      // 'bower_components/jquery/dist/jquery.js',
-      // 'lib/js/h5p-jquery.js',
-      // 'bower_components/h5p-php-library/js/h5p-content-type.js',
-      // 'bower_components/h5p-php-library/js/h5p-event-dispatcher.js',
-      // 'bower_components/h5p-php-library/js/h5p-x-api-event.js',
-      // 'bower_components/h5p-php-library/js/h5p-x-api.js',
-      // 'bower_components/h5p-php-library/js/h5p.js',
-      // 'lib/js/h5p-overwrite.js'
-      ]
+      scripts: [frameJs]
     };
 
     H5PIntegration.init(id, h5pContent, displayOptions);