Changeset 191257

Timestamp:

01/07/2010 09:36:34 PM (16 years ago)

Author:

malcalevak

Message:

JSON option loaderenqueue_script utilized for CSS
Initial implementation of JSON option loading
Minor rearrangement of code.
Additional Extensions Support

Location:

wp-slimbox2/trunk

Files:

• WPlize/WPlize.php (modified) (2 diffs)
• adminmenu.php (modified) (3 diffs)

wp-slimbox2/trunk/WPlize/WPlize.php

@@ -146 +146 @@
         if (is_array(get_option($this->multi_option)) === true) {
             $update = array_merge(
-                                                        get_option($this->multi_option),
-                                                        $data
-                                                     );
+                        get_option($this->multi_option),
+                        $data
+                    );
         } else {
             $update = $data;
@@ -154 +154 @@
         
         update_option(
-                                    $this->multi_option,
-                                    $update
-                                 );
+            $this->multi_option,
+            $update
+        );
     }
 }

wp-slimbox2/trunk/adminmenu.php

@@ -3 +3 @@
 $page = add_options_page('WP-Slimbox2 Options', 'WP-Slimbox2', 8, 'slimbox2options', 'slimbox_options');
 add_action( "admin_print_scripts-$page", 'slimbox_adminhead' );
+add_action( "admin_print_styles-$page", 'slimbox_admin_styles' );
 
 if((get_option('wp_slimbox_autoload')=='')?true:false) {
@@ -24 +25 @@
         'flickr'   => 'off',
         'maintenance' => 'off',
-        'cache'   => time()
+        'cache'   => time(),
+        'disable_css' => 'off'
     ));
 } else {
@@ -46 +48 @@
         'flickr'   => get_option('wp_slimbox_flickr'),
         'maintenance' => get_option('wp_slimbox_maintenance'),
-        'cache'   => get_option('wp_slimbox_cache')
+        'cache'   => get_option('wp_slimbox_cache'),
+        'disable_css' => 'off'
     ));
     delete_option('wp_slimbox_autoload');