Changeset 2929010

Timestamp:

06/21/2023 08:08:22 AM (3 years ago)

Author:

siteimprove

Message:

Version 2.0.2

Location:

siteimprove

Files:

• tags/2.0.2 (added)
• tags/2.0.2/admin (added)
• tags/2.0.2/admin/class-siteimprove-admin.php (added)
• tags/2.0.2/admin/css (added)
• tags/2.0.2/admin/css/siteimprove-admin.css (added)
• tags/2.0.2/admin/css/siteimprove-preview.css (added)
• tags/2.0.2/admin/img (added)
• tags/2.0.2/admin/img/si-icon.svg (added)
• tags/2.0.2/admin/index.php (added)
• tags/2.0.2/admin/js (added)
• tags/2.0.2/admin/js/siteimprove-admin.js (added)
• tags/2.0.2/admin/js/siteimprove.js (added)
• tags/2.0.2/admin/partials (added)
• tags/2.0.2/admin/partials/class-siteimprove-admin-settings.php (added)
• tags/2.0.2/includes (added)
• tags/2.0.2/includes/class-siteimprove-activator.php (added)
• tags/2.0.2/includes/class-siteimprove-deactivator.php (added)
• tags/2.0.2/includes/class-siteimprove-i18n.php (added)
• tags/2.0.2/includes/class-siteimprove-loader.php (added)
• tags/2.0.2/includes/class-siteimprove.php (added)
• tags/2.0.2/includes/class-siteimproveutils.php (added)
• tags/2.0.2/includes/index.php (added)
• tags/2.0.2/index.php (added)
• tags/2.0.2/languages (added)
• tags/2.0.2/languages/siteimprove.pot (added)
• tags/2.0.2/readme.txt (added)
• tags/2.0.2/siteimprove.php (added)
• tags/2.0.2/uninstall.php (added)
• trunk/admin/class-siteimprove-admin.php (modified) (4 diffs)
• trunk/admin/js/siteimprove.js (modified) (5 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/siteimprove.php (modified) (1 diff)

siteimprove/trunk/admin/class-siteimprove-admin.php

@@ -91 +91 @@
         $prepublish_enabled = intval( get_option( 'siteimprove_prepublish_enabled', 0 ) );
 
-        if ( $wp_query->is_preview() && 1 === $prepublish_allowed && 1 === $prepublish_enabled ) {
+        if ( ( $wp_query->is_preview() || $wp_query->is_singular() ) && 1 === $prepublish_allowed && 1 === $prepublish_enabled ) {
             wp_enqueue_style( 'siteimprove_preview_css', plugin_dir_url( __FILE__ ) . 'css/siteimprove-preview.css', array(), $this->version, 'all' );
         }
@@ -191 +191 @@
         }
 
-        $preview = is_preview();
+        $is_content_page = is_preview() || is_singular();
 
         $si_js_args = array(
@@ -198 +198 @@
             'url'   => $url,
             'version' => $disabled_new_version,
-            'preview' => $preview,
+            'is_content_page' => $is_content_page,
         );
 
@@ -397 +397 @@
         $prepublish_enabled = intval( get_option( 'siteimprove_prepublish_enabled', 0 ) );
 
-        if ( is_preview() && 1 === $prepublish_allowed && 1 === $prepublish_enabled ) {
+        if ( ( is_preview() || is_singular() ) && 1 === $prepublish_allowed && 1 === $prepublish_enabled ) {
             $prepublish_button = '<svg xmlns="http://www.w3.org/2000/svg" height="28px" width="28px" viewBox="0 0 24 24" focusable="false" aria-hidden="true" fill="currentColor"><path fill="#141155" d="M12.015625.113281C5.433594.113281.113281 5.433594.113281 12.015625c0 6.578125 5.320313 11.886719 11.902344 11.886719 6.578125 0 11.886719-5.324219 11.886719-11.886719 0-6.566406-5.324219-11.902344-11.886719-11.902344Zm0 0"></path><path fill="#fff" d="m6.097656 14.796875 1.695313-1.003906c.367187.945312 1.074219 1.539062 2.328125 1.539062 1.257812 0 1.625-.507812 1.625-1.074219 0-.746093-.679688-1.042968-2.1875-1.480468-1.539063-.4375-3.050782-1.074219-3.050782-3.007813 0-1.933593 1.609376-2.992187 3.332032-2.992187s2.9375.847656 3.613281 2.257812l-1.664063.960938c-.367187-.777344-.917968-1.300782-1.949218-1.300782-.832032 0-1.328125.4375-1.328125 1.019532 0 .621094.382812.945312 1.921875 1.410156 1.609375.523438 3.316406 1.058594 3.316406 3.121094 0 1.890625-1.523438 3.046875-3.671875 3.046875-2.058594.015625-3.441406-.972657-3.980469-2.496094m8.667969-6.917969c0-.621094.507813-1.160156 1.144531-1.160156.636719 0 1.15625.539062 1.15625 1.160156 0 .621094-.507812 1.140625-1.15625 1.140625-.648437 0-1.144531-.519531-1.144531-1.140625m.214844 1.988282h1.863281v7.230468h-1.863281Zm0 0"></path></svg>';
             $admin_bar->add_menu(

siteimprove/trunk/admin/js/siteimprove.js

@@ -32 +32 @@
 
   var siteimprove = {
-    input: function (url, token, version, preview) {
+    input: function (url, token, version, is_content_page) {
       this.url = url;
       this.token = token;
       this.method = "input";
       this.version = version;
-      this.preview = preview;
+      this.is_content_page = is_content_page;
       this.common(url);
     },
@@ -45 +45 @@
       this.method = "domain";
       this.common(url);
+    },
+    clear: function (callback, token) {
+      this.callback = callback;
+      this.token = token;
+      this.method = "clear";
+      this.common();
     },
     recheck: function (url, token) {
@@ -121 +127 @@
       // 0 = overlay-v1.js
       // 1 = overlay-latest.js
-      if(this.version == 1 && this.preview) {
+      if (this.version == 1 && this.is_content_page) {
         _si.push(['registerPrepublishCallback', getDomCallback, this.token]);
       }
       _si.push([this.method, this.url, this.token]);
 
-      //Calling the "clear" method to avoid smallbox showing a "Page not found" message when inside wp-admin panel
+      // Calling the "clear" method to avoid smallbox showing a "Page not found" message when inside wp-admin panel
       // Do not do this for domain, so we can still see site-view of the plugin
-      if(this.method !== "domain") {
+      if (this.version == 0 && this.method !== "domain") {
         const pattern = /(?:\/wp-admin\/{1})[\D-\d]+.php/;
-        if (this.url.match(pattern)) {
+        if (this.url && this.url.match(pattern)) {
           setTimeout(() => {
-            _si.push(['clear']); 
+            _si.push(['clear', null, this.token]); 
           }, 500);
         }
@@ -180 +186 @@
     // If exist siteimprove_input, call input Siteimprove method.
     if (typeof siteimprove_input !== "undefined") {
-      siteimprove.input(siteimprove_input.url, siteimprove_input.token, siteimprove_input.version, siteimprove_input.preview);
+      siteimprove.input(siteimprove_input.url, siteimprove_input.token, siteimprove_input.version, siteimprove_input.is_content_page);
     }
 
@@ -188 +194 @@
       if( "0" === siteimprove_domain.version ){
         siteimprove.domain(siteimprove_domain.url, siteimprove_domain.token);
+      } else {
+        siteimprove.clear(null, siteimprove_domain.token);
       }
     }

siteimprove/trunk/readme.txt

@@ -87 +87 @@
 == Changelog ==
 
+= 2.0.2 =
+* Added - Calling "clear" on non-content pages in WordPress
+* Added - Prepublish can now be started from a published page
+
 = 2.0.1 =
 * Bugfix - Fixed checkbox for "Use latest experience" was not properly checked on by default

siteimprove/trunk/siteimprove.php

@@ -10 +10 @@
  * Plugin URI:          https://www.siteimprove.com/integrations/cms-plugin/wordpress/
  * Description:         Integration with Siteimprove.
- * Version:             2.0.1
+ * Version:             2.0.2
  * Author:              Siteimprove
  * Author URI:          http://www.siteimprove.com/