- Chg: Added 1.5 defer compatibility

- Fix: Fixed "unreachable code after return statement" in humhub.custom_pages.template.TemplateElement.js
humhub · Apr 6, 2020 · b1d2f79 · b1d2f79
1 parent 7e608ff
commit b1d2f79
Show file tree

Hide file tree

Showing 8 changed files with 215 additions and 144 deletions.
diff --git a/Events.php b/Events.php
diff --git a/assets/Assets.php b/assets/Assets.php
@@ -6,6 +6,15 @@
 
 class Assets extends AssetBundle
 {
+    /**
+     * v1.5 compatibility defer script loading
+     *
+     * Migrate to HumHub AssetBundle once minVersion is >=1.5
+     *
+     * @var bool
+     */
+    public $defer = true;
+
     public $sourcePath = '@custom_pages/resources';
 
     public $publishOptions = [

diff --git a/assets/CkEditorAssetBundle.php b/assets/CkEditorAssetBundle.php
@@ -6,6 +6,15 @@
 
 class CkEditorAssetBundle extends AssetBundle
 {
+    /**
+     * v1.5 compatibility defer script loading
+     *
+     * Migrate to HumHub AssetBundle once minVersion is >=1.5
+     *
+     * @var bool
+     */
+    public $defer = true;
+
     public $jsOptions = ['position' => \yii\web\View::POS_HEAD];
     public $sourcePath = '@custom_pages/resources/ckeditor';
 

diff --git a/assets/CodeMirrorAssetBundle.php b/assets/CodeMirrorAssetBundle.php
@@ -5,10 +5,20 @@
 
 
 use yii\web\AssetBundle;
+use yii\web\View;
 
 class CodeMirrorAssetBundle extends AssetBundle
 {
-    public $jsOptions = ['position' => \yii\web\View::POS_HEAD];
+    /**
+     * v1.5 compatibility defer script loading
+     *
+     * Migrate to HumHub AssetBundle once minVersion is >=1.5
+     *
+     * @var bool
+     */
+    public $defer = true;
+
+    public $jsOptions = ['position' => View::POS_HEAD];
     public $sourcePath = '@custom_pages/resources/codemirror';
 
     public $js = [

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.0.7 (April, 06, 2020)
+--------------------
+- Chg: Added 1.5 defer compatibility
+- Fix: Fixed "unreachable code after return statement" in humhub.custom_pages.template.TemplateElement.js
+
 1.0.6 (February 19, 2020)
 ---------------------
 - Fix #113: Double collapse menu item in snippet context menu

diff --git a/module.json b/module.json
@@ -3,7 +3,7 @@
     "name": "Custom Pages",
     "description": "Allows admins to create custom pages (html or markdown) or external links to various navigations (e.g. top navigation, account menu).",
     "keywords": ["pages", "custom", "iframe", "markdown", "link", "navigation", "spaces"],
-    "version": "1.0.6",
+    "version": "1.0.7",
     "humhub": {
         "minVersion": "1.3.10"
     }

diff --git a/modules/template/assets/TemplateCoreAsset.php b/modules/template/assets/TemplateCoreAsset.php
@@ -6,6 +6,10 @@
 
 class TemplateCoreAsset extends AssetBundle
 {
+    public $publishOptions = [
+        'forceCopy' => true
+    ];
+
     public $sourcePath = '@custom_pages/modules/template/resources';
 
     public $jsOptions = ['position' => \yii\web\View::POS_END];

diff --git a/modules/template/resources/js/humhub.custom_pages.template.TemplateElement.js b/modules/template/resources/js/humhub.custom_pages.template.TemplateElement.js
@@ -296,12 +296,6 @@ humhub.module('custom_pages.template.TemplateElement', function (module, require
 
     TemplateElement.prototype.getUniqueId = function ($element) {
         return this.$.attr('id');
-        if (!$element) {
-            return;
-        }
-
-        return $element.data('template-empty') ? Date.now().toString() :
-                $element.data('template-content') + ':' + $element.data('template-content-id');
     };
 
     TemplateElement.prototype.loader = function (show) {