Changeset 1542243

Timestamp:

11/28/2016 07:45:15 PM (9 years ago)

Author:

mraliende

Message:

1.7 minor bugfix. Loading text did not disappear. Should be solved now.

Location:

good-url-preview-box/trunk

Files:

• gurlpb-start.php (modified) (7 diffs)
• gurlpb_editor-plugin.js (modified) (1 diff)
• readme.txt (modified) (2 diffs)

good-url-preview-box/trunk/gurlpb-start.php

@@ -10 +10 @@
     static $_f_add_js = 0;
     static $_str_srv_dialog = '';
+    static $_f_include_javascript = false;
     static $_str_first_url = ''; // needed for except
 
@@ -52 +53 @@
 
     add_action( 'init', 'gurlpb_buttons' );
+    add_action( 'wp_footer', 'gurlpb_javascript_include', 20 );
 
     if ( get_option( 'gurlpb-showexcerpt' ) ) {
@@ -173 +175 @@
             echo gurlpb_add_previewbox( $strUrl );
         }
-        add_action( 'wp_footer', 'gurlpb_javascript_include', 20 );
+        Gurlpb::$_f_include_javascript = true;
+        //add_action( 'wp_footer', 'gurlpb_javascript_include', 20 );
     }
 
@@ -180 +183 @@
 
 function gurlpb_add_previewbox( $strUrl ) {
+    Gurlpb::$_f_include_javascript = true;
     $arrUrl = parse_url( $strUrl );
     $arrDom = explode( '.' , $arrUrl['host']);
@@ -187 +191 @@
 
     return
-        '<br clear="all" /><span guteurls-remove="true" class="guteurlsRemove" style="display:block; width: 100%; max-width:600px; margin: auto; background-color: #fff">
-        <span  style="width: 100%; line-height: 20px; font-size: 20px; height: 22px; padding:0; margin:20px 0 0 0; display: block; font-family: Oxygen, Arial,  Helvetica, sans-serif; font-weight: normal; font-style: normal; text-transform: uppercase; text-decoration: none; vertical-align: baseline;">
+        '<br clear="all" /><span guteurls-remove="true" id="guteurlsLoading" class="guteurlsRemove" style="display:block; width: 100%; max-width:600px; margin: auto; background-color: #fff">
+        <span style="width: 100%; line-height: 20px; font-size: 20px; height: 22px; padding:0; margin:20px 0 0 0; display: block; font-family: Oxygen, Arial,  Helvetica, sans-serif; font-weight: normal; font-style: normal; text-transform: uppercase; text-decoration: none; vertical-align: baseline;">
             <img src="https://guteurls.de/favicon.ico" align="left" style="height: 20px; margin-right: 10px" />
             GUTE-URLS
@@ -200 +204 @@
             <a href="' . $strUrl .'" style="font-family: Oxygen, Arial, Helvetica, sans-serif; font-weight: normal; font-style: normal; font-size: 13px; line-height: 20px; text-decoration: none; border-bottom: none;">' . $arrUrl['host'] . $strPath  . '</a>
         </span>
-    </span><br clear="all" />';
+    </span>
+    <script type="text/javascript">
+        var gurlpbLR = function () {
+            var a=document.getElementsByClassName("guteurlsRemove");
+            if (a) for( var i=0;i<a.length;i++) { a[i].style["display"]="none"; }
+        };
+        if ( window.addEventListener ) window.addEventListener("load", gurlpbLR, false);
+        else window.setTimeout(gurlpbLR, 2000);
+    </script>
+    <br clear="all" />';
 }
 
 function gurlpb_javascript_include() {
     Gurlpb_utils::log( __FUNCTION__ . '[' . __LINE__ . "]:" );
+    if ( ! Gurlpb::$_f_include_javascript ) {
+        return false;
+    }
     $post_id = get_the_ID(); //this may not work, depending on where code occurs
     $post = $post_id? get_post( $post_id ) : '';
@@ -398 +414 @@
 
                 if ( in_the_loop() ) echo gurlpb_add_previewbox( Gurlpb::$_str_first_url );
-                add_action( 'wp_footer', 'gurlpb_javascript_include', 20 );
+                //add_action( 'wp_footer', 'gurlpb_javascript_include', 20 );
+                Gurlpb::$_f_include_javascript = true;
             }
         }

good-url-preview-box/trunk/gurlpb_editor-plugin.js

@@ -18 +18 @@
                 str = arr[0];
                 var shortcode = '[urlpreviewbox url="' + str + '"/]';
-                return_text = '<span class="gurlpb">' + shortcode + "</span>";
+                return_text = '<span class="gurlpb">' + shortcode + "</span><br />";
                 ed.execCommand('mceInsertContent', 0, return_text);
                 try {

good-url-preview-box/trunk/readme.txt

@@ -116 +116 @@
 == Upgrade Notice ==
 
+= 1.7 =
+Nothing big. No new feature. no new functions. Only a bugfix.
+Bugfix: Text "Guteurls loading..." did not disappear. Now a JS will hide it, after loading page.
+
+I love to hear your suggestions, to make it even better.
+
+
 = 1.6 =
 * Bugfix: Article title link to external URL
@@ -142 +149 @@
 == Changelog ==
 
+= 1.7 =
+* Bugfix: Text: "Guteurls loading..." did not disapear. Now a js will hide it, after loading page.
+
 = 1.6 =
 * Bugfix: Article title link to external URL