Changeset 509532

Timestamp:

02/23/2012 09:49:51 PM (14 years ago)

Author:

brainstormmedia

Message:

• Fix saved CSS being one update behind
• Fix initial values of fields & background color picker
• Fix preview update stall
• Fix background value when no image selected
• Fix background replacement matching

Location:

styles/trunk

Files:

• classes/StormStylesAdmin.php (modified) (2 diffs)
• classes/WordPressBridge.php (modified) (4 diffs)
• classes/stormFirePHP/stormFirePHP.php (modified) (1 diff)
• gui/Color.php (modified) (1 diff)
• js/admin.js (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• styles.php (modified) (4 diffs)

styles/trunk/classes/StormStylesAdmin.php

@@ -470 +470 @@
 
         // Update vars in active file object
-        $this->file->set( $input['variables'] );
-        // Convert input array to object for storage
-        $input['variables'] = $this->file;
-        
-        return $input['variables'];
+        if ( is_array( $input ) ) {
+            $this->file->set( $input['variables'] );
+            // Convert input array to object for storage
+            $input['variables'] = $this->file;
+
+            return $input['variables'];
+        }else {
+            return false;
+        }
+        
     }
     
@@ -567 +572 @@
             // Uses $this->update() sanitation callback
             update_option('StormStyles', $_POST );
+        }else {
+            $this->build();
         }
 

styles/trunk/classes/WordPressBridge.php

@@ -210 +210 @@
         
         // Remove -wp- prefix
-        $meta['property'] = str_replace('-wp-background', 'background', $prop).';';
+        $meta['property'] = trim(str_replace('-wp-background', 'background', $prop), ';').';';
+        
         return $this->background($value, $scaffold, $meta);
     }
@@ -216 +217 @@
     public function background($value, $scaffold, $meta) {
         extract( $this->extract($value) );
+        
         if ( ($match = $this->find_linear_gradient( $value ))  ) {
             return $this->linear_gradient($match);
@@ -231 +233 @@
         }
         
+        if ( false !== strpos($meta['property'], 'url(#)') ) {
+            return '';
+        }
+
         return $meta['property'];
     }
@@ -393 +399 @@
     private function extract($value, $id = '') {
 
-        if ( false !== strpos( $value, $this->meta_gliph ) ) {
+        $glyphpos = strpos( $value, $this->meta_gliph );
+
+        if ( false !== $glyphpos && $value[$glyphpos-1] !== ':' ) { // Catch http:// when glyph == //
             $meta = substr($value, strrpos($value, $this->meta_gliph) + strlen($this->meta_gliph) );
             $value = substr($value, 0, strrpos($value, $this->meta_gliph));

styles/trunk/classes/stormFirePHP/stormFirePHP.php

@@ -1 +1 @@
 <?php
 
-if ( !class_exists('FirePHP') ) {
+if ( !class_exists('FirePHP') && !function_exists('stormFirePHPShutdown') ) {
+    function stormFirePHPShutdown() {
+        $error=error_get_last();
+       if($error=null) FB::log($error['message'], 'Fatal Error '.basename($error['file']).':'.$error['line']);
+    }
+    
     ob_start();
     include dirname(__FILE__).'/FirePHPCore/fb.php';
+
+    if ( false !== strpos($_SERVER['DOCUMENT_ROOT'], '/Users/') || BSM_DEVELOPMENT === true ) {
+        // Development
+        error_reporting(E_ALL & ~E_NOTICE );
+
+        $firePHP = FirePHP::getInstance(true);
+        $firePHP->registerErrorHandler();
+        $firePHP->registerExceptionHandler();
+
+        register_shutdown_function('stormFirePHPShutdown');
+    }else {
+        FB::setEnabled(false);
+    }
+
 }
-
-if ( false !== strpos($_SERVER['DOCUMENT_ROOT'], '/Users/') || WP_DEBUG === true || BSM_DEVELOPMENT === true ) {
-    // Development
-    error_reporting(E_ALL & ~E_NOTICE );
-    
-    $firePHP = FirePHP::getInstance(true);
-    $firePHP->registerErrorHandler();
-    $firePHP->registerExceptionHandler();
-    
-    register_shutdown_function('stormFirePHPShutdown');
-}else {
-    FB::setEnabled(false);
-}
-
-function stormFirePHPShutdown() {
-    $error=error_get_last();
-   if($error=null) FB::log($error['message'], 'Fatal Error '.basename($error['file']).':'.$error['line']);
-}

styles/trunk/gui/Color.php

@@ -41 +41 @@
     
     function output() {
-        // Change color picker to http://www.digitalmagicpro.com/jPicker/
         ?>
         <input class="pds_color_input" type="text" name="<?php echo $this->form_name ?>[color]" id="<?php echo $this->form_id ?>" value="<?php echo $this->value('form', 'color'); ?>" size="8" maxlength="8" />

styles/trunk/js/admin.js

@@ -207 +207 @@
                 setColor($color, hex);
             },
-            flat: true
+            flat: true,
+            color: 'ff0000'
         };
             
@@ -338 +339 @@
         var load_color = function() {
             
+            var colorVal = $color.val().replace('#', '');
+            
             // Update color field value
-            if ( $color.val().length > 1 ) {
-                $color.data('color',  $color.val().replace('#', '') );
-                $color.data('ahex',  $color.val().replace('#', '') );
+            if ( colorVal.length > 1 ) {
+                $color.data('color',  colorVal );
+                $color.data('ahex',  colorVal );
             }else {
                 $color.data('ahex',  'ffffffff' );
             }
-            $css.val( $color.val() ).change();
-            
-            var colorPicker = $('<div/>').ColorPicker( colorPickerOpts );
+            $css.val( $color.val() ).change(); // Keeps #
+            
+            var tmpColorPickerOpts = $.extend( colorPickerOpts, { color: colorVal });
+            
+            var colorPicker = $('<div/>').ColorPicker( tmpColorPickerOpts );
             
             $ui.append( colorPicker );

styles/trunk/readme.txt

@@ -7 +7 @@
 Requires at least: 3.1
 Tested up to: 3.3.1
-Stable tag: 0.4.0
+Stable tag: 0.4.1
 
 Change the appearance of supported themes using zero code. Creates appearance options for images, colors, gradients, and fonts.
@@ -21 +21 @@
 * Google Fonts
 * Font size, color, styling, and capitalization
+* Live preview
 
 The plugin includes full support for TwentyTen and TwentyEleven out of the box. Just enable the plugin, and you can start playing with your site's look under Appearance > Styles.
 
-For experienced developers, other themes can be integrated using only CSS. A full theme GUI can be created in less than an hour by those familiar with CSS syntax. An example of how fast this process is can be seen in the video below.
+Here's a quick demo of how it works in TwentyEleven:
 
-[youtube http://www.youtube.com/watch?v=-Iw8d0g_ltQ]
+[youtube http://www.youtube.com/watch?v=2gbRFFxx1GY]
 
 **Warning**: While we have spent a lot of time testing and using Styles, it is still experimental! We may add or remove features or change syntax in future updates. This plugin requires [PHP 5.2](https://codex.wordpress.org/Switching_to_PHP5), which is the minimum supported version as of WordPress 3.2.
@@ -70 +71 @@
 == Changelog ==
 
+= 0.4.1 =
+* Fix saved CSS being one update behind
+* Fix initial values of fields & background color picker
+* Fix preview update stall
+* Fix background value when no image selected
+* Fix background replacement matching
+
 = 0.4.0 =
 * Initial public release.

styles/trunk/styles.php

@@ -3 +3 @@
 Plugin Name: Styles
 Plugin URI: http://stylesplugin.com
-Description: Change the appearance of any theme using the WordPress admin. Creates WordPress theme options from CSS: images, colors, gradients, and fonts.
-Version: 0.4
+Description: Change the appearance of your theme using the WordPress admin. Creates WordPress theme options for images, colors, gradients, and fonts.
+Version: 0.4.1
 Author: Brainstorm Media
 Author URI: http://brainstormmedia.com
@@ -57 +57 @@
      * @var int
      **/
-    var $version = '0.4';
+    var $version = '0.4.1';
     
     /**
@@ -414 +414 @@
      **/
     function load_file() {
-        if ( false !== $this->file ) { return; }
-        
         global $blog_id;
 
@@ -434 +432 @@
 
             $this->css = new StormCSSParser( $file['path'], $this );
-            
-            $this->file   = new StormStyles_Extension_Variable( $file, $this );
-            
-        }else if ( BSM_DEVELOPMENT === true ){
+
+            if ( !isset($_GET['scaffold']) ) {
+                // No need to init vars if we're just outputting
+                $this->file   = new StormStyles_Extension_Variable( $file, $this );
+
+                // Merge values from database into variable objects
+                if ( @is_object( $this->options['variables'] ) && is_object($this->file) ) {
+                    $this->file->set( $this->options['variables']->get() );
+                }
+            }
+        }
+        
+        if ( false !== $this->file ) { return; }
+
+        if ( BSM_DEVELOPMENT === true ){
             
             // Development: Force re-render on every CSS load