Changeset 1120783

Timestamp:

03/25/2015 08:31:07 PM (11 years ago)

Author:

ShopSite

Message:

Improve compatibility with other TinyMCE plugins; improve image display

Location:

shopsite-plugin/trunk

Files:

• readme.txt (modified) (1 diff)
• shopsite.php (modified) (9 diffs)

shopsite-plugin/trunk/readme.txt

@@ -26 +26 @@
 
 == Changelog ==
+= 1.5.4 =
+* Improve compatibility with other TinyMCE plugins; improve image display
+
 = 1.5.3 =
 * Fix for PHP versions less than 5.4.

shopsite-plugin/trunk/shopsite.php

@@ -2 +2 @@
 /**
  * @package ShopSite
- * @version 1.5.3
+ * @version 1.5.4
  */
 /*
@@ -9 +9 @@
 Description: ShopSite plugin to put products into your WordPress blog
 Author: ShopSite
-Version: 1.5.3
+Version: 1.5.4
 Author URI: http://shopsite.com/
 */
@@ -58 +58 @@
 
 function load_plugin() {
-    $version = "1.5.3";
+    $version = "1.5.4";
     if ( is_admin() ) {  
       $running_version = get_option('ss_version');
@@ -118 +118 @@
 }
 
+function link_ss_path() {
+  echo "<script>var ss_path='".plugin_dir_url(__FILE__)."';</script>";
+}
+
 
 //add_action( 'admin_enqueue_scripts', 'link_jquery' );
 add_action( 'admin_head', 'link_tutorial' );
+add_action( 'admin_head', 'link_ss_path' );
 add_action( 'admin_init', 'load_plugin' );
 add_action( 'wp_enqueue_scripts', 'add_scripts' );
@@ -153 +158 @@
     update_option('ss_config_type', $config_type);
     $state = 'settings_saved';
+    
+    delete_option('ss_media_url');
     
     if ($config_type == 'ss_12') {
@@ -310 +317 @@
  
 // Load the TinyMCE plugin : editor_plugin.js (wp2.5)
-function add_shopsite_tinymce_plugin($plugin_array) {
-  echo 
-  "<script>
-  var ss_path='".plugin_dir_url(__FILE__)."'; 
-  </script>";
-  
+
+
+function add_shopsite_tinymce_plugin($plugin_array) { 
   $path = plugin_dir_url(__FILE__).'editor_plugin.js';
   $plugin_array['shopsite'] = $path;
@@ -369 +373 @@
   $extra_space = "";
   $message = "";
-  if (!get_option('ss_media_url')) 
+  $media_url = get_media_url();
+  if (!$media_url) 
   {
     $extra_space = " style='height:80px;'";
@@ -382 +387 @@
 }
 
-
-
-function get_product_list() {
-  include_once "oauth.php";
-  $limit = 1000;
-  //echo ("in:|".$_REQUEST['search_string']."|<br>");
-  $search_string = stripslashes(trim($_REQUEST['search_string']));
-  
-  
-  $remember_search = $_REQUEST['remember_search'];
-  
-  ///debug_print("Updating remember_search to $remember_search");
-  update_option('ss_remember_search', $remember_search);
-  
-  if ($remember_search == 'true') {
-    update_option('ss_remembered_search_string', $search_string);
-  }
-
-  
-  $shopsite_url = get_option('ss_shopsite_url');
-
-  
-  $media_url = false;//get_option('media_url');
+function get_media_url() {
+  $media_url = get_option('ss_media_url');
   if (!$media_url) {
     $shopsite_url = get_option('ss_shopsite_url');
@@ -415 +399 @@
     }
   }
+  return $media_url;
+}
+
+
+function get_product_list() {
+  include_once "oauth.php";
+  $limit = 1000;
+  //echo ("in:|".$_REQUEST['search_string']."|<br>");
+  $search_string = stripslashes(trim($_REQUEST['search_string']));
+  
+  
+  $remember_search = $_REQUEST['remember_search'];
+  
+  ///debug_print("Updating remember_search to $remember_search");
+  update_option('ss_remember_search', $remember_search);
+  
+  if ($remember_search == 'true') {
+    update_option('ss_remembered_search_string', $search_string);
+  }
+
+  
+  $shopsite_url = get_option('ss_shopsite_url');
+
+  
+  $media_url = get_media_url();