Changeset 2604494

Timestamp:

09/24/2021 03:46:31 PM (4 years ago)

Author:

aspiesoft

Message:

updated settings

Location:

aspiesoft-auto-embed/trunk

Files:

• aspiesoft-auto-embed.php (modified) (1 diff)
• assets/settings.js (modified) (6 diffs)
• readme.txt (modified) (1 diff)
• src/assets/0settings.php (modified) (2 diffs)
• src/main.php (modified) (1 diff)
• src/settings.php (modified) (2 diffs)

aspiesoft-auto-embed/trunk/aspiesoft-auto-embed.php

@@ -4 +4 @@
 */
 /*
-Plugin Name: Auto Embed (YouTube, Facebook, PDF, Image)
+Plugin Name: Auto Embed (YouTube, Facebook, PDF, Image, And More)
 Plugin URI: https://github.com/AspieSoft/aspiesoft-auto-embed
 Description: Easily Embed Dynamic Lazy Loading Youtube Videos Simply By Pasting The Url.
-Version: 1.4.5
+Version: 1.4.6
 Author: AspieSoft
 Author URI: https://www.aspiesoft.com

aspiesoft-auto-embed/trunk/assets/settings.js

@@ -59 +59 @@
     }
 
+
     let valueAttr = '';
     if(value && type !== 'bool'){
+      if(value.startsWith('[') && value.endsWith(']')){
+        try{
+          value = JSON.parse(value.replace(/\\([\\"])/g, '$1')).join('\n').trim();
+        }catch(e){}
+      }
+
       value = value.replace(/\\?"/g, '\\"');
       valueAttr = ' value="'+value+'"';
@@ -67 +74 @@
     let defValueAttr = '';
     if(defaultValue && type !== 'bool'){
+      if(defaultValue.startsWith('[') && defaultValue.endsWith(']')) {
+        try {
+          defaultValue = JSON.parse(defaultValue.replace(/\\([\\"])/g, '$1')).join('\n').trim();
+        } catch(e) {}
+      }
+
       defaultValue = defaultValue.replace(/\\?"/g, '\\"');
       defValueAttr = ' placeholder="'+defaultValue+'"';
@@ -92 +105 @@
 
       let origValue = '';
-      if(value !== ''){origValue = ' origValue="'+value+'"';}
-      return '<textarea name="'+name+'"'+valueAttr+defValueAttr+origValue+style+'></textarea>';
+      if(value !== '') {origValue = ' origValue="' + value + '"';}
+
+      if(value === defaultValue){value = '';}
+
+      return '<textarea type="' + inputType + '" name="' + name + '"' + defValueAttr + origValue + style + '>' + value.replace(/<\/textarea>/g, '')+'\n' +'</textarea>';
 
     }else if(inputType === 'select' && optionsList){
@@ -267 +283 @@
         //let origValue = $(this).attr('origValue');
         let defaultValue = optionsList[name]['default'];
+
+        if(elmTag === 'textarea') {
+          defaultValue = defaultValue.split(/\r?\n/).filter(val => val.trim() !== '');
+          if(!defaultValue.length) {
+            defaultValue = '';
+          } else {
+            defaultValue = JSON.stringify(defaultValue);
+          }
+        }
 
         if(elmType === 'checkbox'){
@@ -400 +425 @@
       elmTag = elmTag.toLowerCase();
       if(elmType){elmType = elmType.toLowerCase();}else{elmType = '';}
-      
+
       // don't run for hidden, button, and submit input types
       if(elmTag === 'input' && (elmType === 'hidden' || elmType === 'button' || elmType === 'submit')){
@@ -463 +488 @@
       let value = $(this).val();
       let origValue = $(this).attr('origValue');
+
+      if(elmTag === 'textarea'){
+        value = value.split(/\r?\n/).filter(val => val.trim() !== '');
+        if(!value.length){
+          value = '';
+        }else{
+          value = JSON.stringify(value);
+        }
+
+        origValue = origValue.split(/\r?\n/).filter(val => val.trim() !== '');
+        if(!origValue.length) {
+          origValue = '';
+        } else {
+          origValue = JSON.stringify(origValue);
+        }
+
+        if($(this).attr('placeholder') === value){
+          value = '';
+        }
+
+        if($(this).attr('placeholder') !== origValue) {
+          origValue = 'null';
+        }
+      }
 
       // add value to builder

aspiesoft-auto-embed/trunk/readme.txt

@@ -1 @@
-=== Auto YouTube Embed ===
+=== Auto Embed (YouTube, Facebook, PDF, Image, And More) ===
 Contributors: AspieSoft
-Tags: youtube, embed, auto, pdf, image, img, webP, dynamic, simple, lazy-load, css
+Tags: youtube, embed, auto, pdf, image, img, webP, dynamic, simple, lazy-load, css, facebook
 Requires at least: 3.0.1
 Tested up to: 5.8
-Stable tag: 1.4.5
+Stable tag: 1.4.6
 Requires PHP: 5.2.4
 License: GPLv2 or later

aspiesoft-auto-embed/trunk/src/assets/0settings.php

@@ -71 +71 @@
       // only embed shortcode
       if ($options['get']('ytOnlyEmbedShortcode', false, true)) {
-        $this->opts['requireAttrs'] = array('yt-auto-embed');
+        $this->opts['requireAttrs'] = array('aspiesoft-auto-embed');
       }
 
@@ -81 +81 @@
 
       $includeDomains = $options['get']('includeDomains');
-      if ($includeDomains !== 'example.com') {
-        $this->opts['includeDomains'] = explode('\n', $includeDomains);
+      if ($includeDomains && $includeDomains !== 'example.com') {
+        if(str_starts_with($includeDomains, '[') && str_ends_with($includeDomains, ']')){
+          try{
+            $this->opts['includeDomains'] = json_decode(preg_replace('/\\([\\"])/', '$1', $includeDomains));
+          }catch(Exception $e){}
+        }else{
+          $this->opts['includeDomains'] = explode('\n', $includeDomains);
+        }
       }
 

aspiesoft-auto-embed/trunk/src/main.php

@@ -144 +144 @@
 
       if(self::$options['get']('ytOnlyEmbedShortcode', false, true)){
-        $result .= ' yt-auto-embed';
+        $result .= ' aspiesoft-auto-embed';
       }
 

aspiesoft-auto-embed/trunk/src/settings.php

@@ -56 +56 @@
         'disableWpEmbed' => array('label' => 'Disable Wp-Embed', 'default' => 'false', 'form' => '[check][label][br]', 'type' => 'bool'),
         'enableEditorAutoUrl' => array('label' => 'Automatically Make URLs Clickable In Page Editor', 'default' => 'false', 'form' => '[check][label][br][br]', 'type' => 'bool'),
+        
         'overrideIframes' => array('label' => 'Override Compatable Iframes Including WP-Embed Iframes', 'default' => 'false', 'form' => '[check][label][br][br]', 'type' => 'bool'),
+        'ytOnlyEmbedShortcode' => array('label' => 'Only Embed Shortcodes', 'default' => 'false', 'form' => '[check][label][br][br]', 'type' => 'bool'),
 
         'altShortcode_default' => array('label' => 'Alternate Shortcode Name', 'default' => '', 'form' => '[label][text][br]'),
@@ -82 +84 @@
         'embedAuto' => array('label' => 'Auto Play', 'default' => 'false', 'form' => '[check][label]', 'type' => 'bool'),
         'embedMute' => array('label' => 'Mute', 'default' => 'false', 'form' => '[check][label][br]', 'type' => 'bool'),
-
-        'ytOnlyEmbedShortcode' => array('label' => 'Only Embed Shortcodes', 'default' => 'false', 'form' => '[check][label][br]', 'type' => 'bool'),
 
       );