Changeset 2461813

Timestamp:

01/24/2021 03:25:43 PM (5 years ago)

Author:

Appizy

Message:

Version 2.1.0 of Appizy App Embed

Location:

appizy-app-embed

Files:

• tags/2.1.0 (added)
• tags/2.1.0/appizy-app-embed.php (added)
• tags/2.1.0/class (added)
• tags/2.1.0/class/class-appizy-api.php (added)
• tags/2.1.0/class/class-appizy-app-embed.php (added)
• tags/2.1.0/css (added)
• tags/2.1.0/css/appizy-styles.css (added)
• tags/2.1.0/includes (added)
• tags/2.1.0/includes/admin-config.php (added)
• tags/2.1.0/includes/admin-tools-screen.php (added)
• tags/2.1.0/includes/app-embed.php (added)
• tags/2.1.0/js (added)
• tags/2.1.0/js/admin-tools-screen.js (added)
• tags/2.1.0/js/embed.js (added)
• tags/2.1.0/license.txt (added)
• tags/2.1.0/readme.txt (added)
• trunk/appizy-app-embed.php (modified) (1 diff)
• trunk/class/class-appizy-app-embed.php (modified) (3 diffs)
• trunk/css/appizy-styles.css (modified) (2 diffs)
• trunk/includes/admin-tools-screen.php (modified) (1 diff)
• trunk/includes/app-embed.php (modified) (3 diffs)
• trunk/js/admin-tools-screen.js (modified) (2 diffs)
• trunk/js/embed.js (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)

appizy-app-embed/trunk/appizy-app-embed.php

@@ -9 +9 @@
 Author: Appizy
 Author URI: http://www.appizy.com
-Version: 2.0.1
+Version: 2.1.0
 Text Domain: appizy
 */
 
 /*
-Copyright (C) 2017 Appizy
+Copyright (C) 2017-2021 Appizy
 
 This program is free software: you can redistribute it and/or modify

appizy-app-embed/trunk/class/class-appizy-app-embed.php

@@ -26 +26 @@
         add_action( 'wp_loaded', array( $this, 'enqueue_appizy_scripts' ) );
         add_action( 'wp_loaded', array( $this, 'enqueue_appizy_styles' ) );
+
+        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_appizy_admin_script' ) );
+    }
+
+    public function enqueue_appizy_admin_script() {
+        wp_register_script( 'appizy-admin-script', plugins_url( '/../js/admin-tools-screen.js', __FILE__ ), array( 'jquery' ), null, true );
+
+        wp_enqueue_script( 'appizy-admin-script' );
     }
 
@@ -33 +41 @@
     public function enqueue_appizy_scripts() {
         wp_register_script( 'appizy-script', plugins_url( '/../js/embed.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_register_script( 'appizy-admin-script', plugins_url( '/../js/admin-tools-screen.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_register_style( 'appizy-styles', plugins_url( '/../css/appizy-styles.css', __FILE__ ) );
 
         wp_enqueue_script( 'appizy-script' );
-        wp_enqueue_script( 'appizy-admin-script' );
 
         wp_localize_script(
@@ -51 +56 @@
      */
     public function enqueue_appizy_styles() {
+        wp_register_style( 'appizy-styles', plugins_url( '/../css/appizy-styles.css', __FILE__ ) );
+
         wp_enqueue_style( 'appizy-styles' );
     }

appizy-app-embed/trunk/css/appizy-styles.css

@@ -1 @@
-.appizy-app {
-
-}
 
 .appizy-app-iframe {
@@ -9 +6 @@
 
 .appizy-app-toolbar {
-    border-bottom: 1px solid #eee;
     border-top: 1px solid #eee;
     margin: 0.4em 0 1em 0;

appizy-app-embed/trunk/includes/admin-tools-screen.php

@@ -59 +59 @@
                 </tr>
                 <tr>
+                    <th><?php _e( 'Manual height' ); ?></th>
+                    <td>
+                        <input name="height" type="number" value="" placeholder="" size="4"> px
+                        <p class="description"><?php _e( 'Leave empty for auto height.' ); ?></p>
+                    </td>
+                </tr>
+                <tr>
                     <th><?php _e( 'Shortcode' ); ?></th>
                     <td>

appizy-app-embed/trunk/includes/app-embed.php

@@ -17 +17 @@
     $attributes = shortcode_atts(
         [
-            'id'   => null,
-            'save' => 'disabled',
+            'id'     => null,
+            'save'   => 'disabled',
+            'height' => null
         ],
         $attributes,
@@ -27 +28 @@
 
     $atts_id = $attributes['id'];
+    $height_attribute = $attributes['height'] ? 'height="' . $attributes['height'] . '" ' : '';
 
-    $content = "<div class='appizy-app'><iframe class='appizy-app-iframe' " .
-        "data-app-id='$atts_id' frameborder='0' width='100%' src='$attachment_url'></iframe>";
+    $content = "<div class='appizy-app'><iframe class='appizy-app-iframe' " . $height_attribute .
+               "data-app-id='$atts_id' frameborder='0' width='100%' src='$attachment_url'></iframe>";
 
     if ( is_user_logged_in() ) {
@@ -35 +37 @@
         if ( 'enabled' === $attributes['save'] ) {
             $content .= '<div class="appizy-app-toolbar">';
-            $content .= '<button type="submit">Save</button>';
+            $content .= '<button class="button" type="submit">Save</button>';
             $content .= '</div>';
         }

appizy-app-embed/trunk/js/admin-tools-screen.js

@@ -13 +13 @@
         var appIdSelector = appizyGeneratorForm.querySelector('select[name="app-id"]');
         var enableSaveDataCheckbox = appizyGeneratorForm.querySelector('input[name="enable-save"]');
+        var appContainerHeight = appizyGeneratorForm.querySelector('input[name="height"]');
 
         appizyGeneratorForm.addEventListener('change', function () {
             var appId = appIdSelector.value;
             var enableSave = enableSaveDataCheckbox.checked;
+            var height = appContainerHeight.value;
 
-            shortCodeOutput.value = generateShortCode(appId, enableSave);
+            shortCodeOutput.value = generateShortCode(appId, enableSave, height);
         });
     }
 
     /**
-     * @param {string} appId
-     * @param {boolean} enableSave
-     * @return {string}
-     */
-    function generateShortCode(appId, enableSave) {
+     * @param {string} appId
+     * @param {boolean} enableSave
+     * @param {string} appContainerHeight
+     * @return {string}
+     */
+    function generateShortCode(appId, enableSave, appContainerHeight) {
         var shortCode = '';
 
@@ -36 +39 @@
                 shortCode += ' save="enabled"';
             }
+
+            if (appContainerHeight > 0) {
+                shortCode += ' height="' + appContainerHeight + '"';
+            }
 
             shortCode += ']';

appizy-app-embed/trunk/js/embed.js

@@ -2 +2 @@
 
 (function ($) {
-    var default_margin = 16;
     var apps = document.getElementsByClassName('appizy-app');
 
@@ -12 +11 @@
         var isSaveEnabled = !!saveButton;
 
-        frame.addEventListener('load', _resizeFrame);
+                if (!frame.height) {
+                        frame.addEventListener('load', _resizeFrame);
+                }
 
         if (isSaveEnabled) {
@@ -21 +22 @@
 
     function _resizeFrame() {
-        this.style.height = this.contentWindow.document.body.offsetHeight + default_margin + 'px';
+        this.style.height = this.contentWindow.document.body.scrollHeight + 'px';
     }
 

appizy-app-embed/trunk/readme.txt

@@ -3 +3 @@
 Tags: appizy, spreadsheet, embed, calculator, web-calculator
 Requires at least: 4.9
-Tested up to: 5.3
+Tested up to: 5.6
 Requires PHP: 5.6
 Stable tag:2.0.1
@@ -85 +85 @@
 == Changelog ==
 
+= 2.1.0 =
+
+* Add new "height" option in shortcode configuration to skip auto-height calculation on load.
+* Remove default margin in auto-height calculation.
+
 = 2.0.1 =
 * Fix the version number inside plugin files