Changeset 1859263

Timestamp:

04/16/2018 06:02:48 PM (8 years ago)

Author:

jond

Message:

Added 1.4 release

Location:

shopp/trunk

Files:

• Shopp.php (modified) (1 diff)
• core/flow/Ajax.php (modified) (9 diffs)
• core/flow/Categorize.php (modified) (4 diffs)
• core/flow/Install.php (modified) (1 diff)
• core/flow/Scripts.php (modified) (4 diffs)
• core/flow/Service.php (modified) (1 diff)
• core/flow/Warehouse.php (modified) (9 diffs)
• core/library/Core.php (modified) (1 diff)
• core/library/Loader.php (modified) (1 diff)
• core/library/PartialUpload.php (added)
• core/library/Version.php (modified) (2 diffs)
• core/model/Tax.php (modified) (3 diffs)
• core/ui/behaviors/calendar.js (modified) (1 diff)
• core/ui/behaviors/calendar.min.js (modified) (1 diff)
• core/ui/behaviors/colorbox.js (modified) (45 diffs)
• core/ui/behaviors/colorbox.min.js (modified) (1 diff)
• core/ui/behaviors/dropzone.js (added)
• core/ui/behaviors/dropzone.min.js (added)
• core/ui/behaviors/editors.js (modified) (4 diffs)
• core/ui/behaviors/editors.min.js (modified) (1 diff)
• core/ui/behaviors/shopp.js (modified) (1 diff)
• core/ui/behaviors/shopp.min.js (modified) (1 diff)
• core/ui/behaviors/suggest.js (modified) (1 diff)
• core/ui/behaviors/suggest.min.js (modified) (1 diff)
• core/ui/categories/category.js (modified) (2 diffs)
• core/ui/categories/category.min.js (modified) (1 diff)
• core/ui/categories/category.php (modified) (2 diffs)
• core/ui/categories/ui.php (modified) (1 diff)
• core/ui/help/advanced.php (modified) (1 diff)
• core/ui/products/editor.js (modified) (4 diffs)
• core/ui/products/editor.min.js (modified) (1 diff)
• core/ui/products/editor.php (modified) (2 diffs)
• core/ui/products/ui.php (modified) (2 diffs)
• core/ui/settings/advanced.php (modified) (2 diffs)
• core/ui/styles/admin.css (modified) (3 diffs)
• readme.md (modified) (1 diff)

shopp/trunk/Shopp.php

@@ -4 +4 @@
  * Plugin URI: http://shopplugin.com
  * Description: An ecommerce framework for WordPress.
- * Version: 1.3.13
+ * Version: 1.4
  * Author: Ingenesis Limited
  * Author URI: http://ingenesis.net
- * Requires at least: 3.5
- * Tested up to: 4.7.4
+ * Requires at least: 4.4
+ * Tested up to: 4.9.5
  *
  *    Portions created by Ingenesis Limited are Copyright © 2008-2014 by Ingenesis Limited

shopp/trunk/core/flow/Ajax.php

@@ -38 +38 @@
         }
 
-        // Flash uploads require unprivileged access
+        // File uploads require unprivileged access
         add_action('wp_ajax_nopriv_shopp_upload_image', array($this, 'upload_image'));
         add_action('wp_ajax_nopriv_shopp_upload_file', array($this, 'upload_file'));
@@ -157 +157 @@
 
     public function upload_image () {
-        $Warehouse = new ShoppAdminWarehouse;
-        echo $Warehouse->images();
-        exit();
+        $file = isset($_FILES['file']) ? $_FILES['file'] : false;
+        $parent = isset($_GET['parent']) ? (int)$_GET['parent'] : false;
+        $type = isset($_GET['type']) ? $_GET['type'] : false;
+        ShoppAdminWarehouse::images($file, $parent, $type);
     }
 
     public function upload_file () {
-        $Warehouse = new ShoppAdminWarehouse;
-        echo $Warehouse->downloads();
-        exit();
+        $file = isset($_FILES['file']) ? $_FILES['file'] : false;
+        ShoppAdminWarehouse::downloads($file, $_POST);
     }
 
@@ -413 +413 @@
                         $where[] = "tt.taxonomy = '" . $taxonomy . "'";
                         if ( 'shopp_popular_tags' == strtolower($q) ) {
-                            $q = ''; 
+                            $q = '';
                             $orderlimit = "ORDER BY tt.count DESC LIMIT 15";
                         }
@@ -574 +574 @@
 
         $error    = create_function('$s', 'die(json_encode(array("error" => $s)));');
-        if (empty($_REQUEST['url'])) $error(Shopp::__('No file import URL was provided.'));
+        if ( empty($_REQUEST['url']) )
+            $error(Shopp::__('No file import URL was provided.'));
         $url      = $_REQUEST['url'];
         $request  = parse_url($url);
@@ -604 +605 @@
                 $_->mime = $mime;
         } else {
-            if ( ! $importfile = @tempnam(sanitize_path(realpath(SHOPP_TEMP_PATH) ), 'shp')) $error(Shopp::__('A temporary file could not be created for importing the file.', $importfile));
-            if ( ! $incoming   = @fopen($importfile,'w') ) $error(Shopp::__('A temporary file at %s could not be opened for importing.', $importfile));
-
-            if ( ! $file = @fopen(linkencode($url), 'rb') ) $error(Shopp::__('The file at %s could not be opened for importing.', $url));
+            if ( ! ($importfile = @tempnam(sanitize_path(realpath(SHOPP_TEMP_PATH) ), 'shp')) ) $error(Shopp::__('A temporary file could not be created for importing the file.', $importfile));
+            if ( ! ($incoming   = @fopen($importfile, 'w')) ) $error(Shopp::__('A temporary file at %s could not be opened for importing.', $importfile));
+
+            if ( ! ($file = @fopen(linkencode($url), 'rb')) ) $error(Shopp::__('The file at %s could not be opened for importing.', $url));
             $data = @stream_get_meta_data($file);
 
@@ -622 +623 @@
 
             $tmp = basename($importfile);
-            // $Settings =& ShoppSettings();
 
             $_->path = $importfile;
@@ -639 +639 @@
         if ( ! $_->mime ) $_->mime = "application/octet-stream";
 
-        echo str_repeat(' ', 1024); // Minimum browser data
+        echo str_repeat(' ', 1024) . "\n"; // Minimum browser data
         echo '<script type="text/javascript">var importFile = ' . json_encode($_) . ';</script>'."\n";
         echo '<script type="text/javascript">var importProgress = 0;</script>' . "\n";
-        if ( $_->stored ) exit();
+        if ( $_->stored )
+            exit();
         @ob_flush();
         @flush();
@@ -657 +658 @@
                 fwrite($incoming, $buffer);
                 $bytesread += strlen($buffer);
-                echo '<script type="text/javascript">importProgress = ' . $bytesread/(int)$_->size . ';</script>'."\n";
+                echo '<script type="text/javascript">importProgress = ' . ( $bytesread / (int)$_->size ) . ';</script>'."\n";
                 @ob_flush();
                 @flush();
@@ -666 +667 @@
         fclose($incoming);
 
-        exit();
+        wp_die('');
     }
 

shopp/trunk/core/flow/Categorize.php

@@ -38 +38 @@
 
             wp_enqueue_script('postbox');
-            wp_enqueue_script('swfupload-all');
+            wp_enqueue_script('dropzone');
 
             if ( user_can_richedit() ) {
@@ -51 +51 @@
             shopp_enqueue_script('priceline');
             shopp_enqueue_script('ocupload');
-            //shopp_enqueue_script('swfupload');
-            //shopp_enqueue_script('shopp-swfupload-queue');
+            shopp_enqueue_script('dropzone');
+            shopp_enqueue_script('jquery-tmpl');
 
             do_action('shopp_category_editor_scripts');
@@ -354 +354 @@
         );
 
-        $uploader = shopp_setting('uploader_pref');
-        if ( ! $uploader ) $uploader = 'flash';
-
         $workflows = array(
             "continue"  => Shopp::__('Continue Editing'),
@@ -363 +360 @@
             "next"      => Shopp::__('Edit Next'),
             "previous"  => Shopp::__('Edit Previous')
-            );
+        );
 
         do_action('add_meta_boxes', ProductCategory::$taxon, $Category);

shopp/trunk/core/flow/Install.php

@@ -425 +425 @@
 
         // System Settings
-        $Settings->setup('uploader_pref', 'flash');
         $Settings->setup('script_loading', 'global');
         $Settings->setup('script_server', 'plugin');

shopp/trunk/core/flow/Scripts.php

@@ -205 +205 @@
 
     $scripts->base_url = $url;
-    $scripts->default_version = mktime(false,false,false,1,1,2010);
+    $scripts->default_version = mktime(false,false,false,1,1,2017);
     $scripts->default_dirs = array('/ui/behaviors/','/ui/products');
 
@@ -242 +242 @@
     $scripts->add_data('ocupload', 'group', 1);
 
+    $scripts->add('dropzone', '/ui/behaviors/dropzone.js', array(), $version);
+    $scripts->add_data('dropzone', 'group', 1);
+
     $scripts->add('orders', '/ui/behaviors/orders.js', array('jquery'), $version);
     $scripts->add_data('orders', 'group', 1);
@@ -322 +325 @@
     $scripts->add('reports', '/ui/behaviors/reports.js', array(), $version);
     $scripts->add_data('reports', 'group', 1);
-
 }
 
@@ -358 +360 @@
     // Address Helper
     shopp_localize_script('address', '$shopp_address', array(
-        'country_no_postal_codes' => Lookup::country_no_postal_codes() 
+        'country_no_postal_codes' => Lookup::country_no_postal_codes()
     ));
 

shopp/trunk/core/flow/Service.php

@@ -224 +224 @@
         $joins = join(' ', $joins);
 
-        $countquery = "SELECT count(*) as total,SUM(IF(txnstatus IN ('authed', 'captured'), total, NULL)) AS sales, AVG(IF(txnstatus IN ('authed', 'captured'), total, NULL)) AS avgsale FROM $Purchase->_table AS o $joins $where ORDER BY o.created DESC LIMIT 1";
+        $countquery = "SELECT count(*) as total,SUM(IF(txnstatus IN ('authed', 'captured'), o.total, NULL)) AS sales, AVG(IF(txnstatus IN ('authed', 'captured'), o.total, NULL)) AS avgsale FROM $Purchase->_table AS o $joins $where ORDER BY o.created DESC LIMIT 1";
         $this->ordercount = sDB::query($countquery, 'object');
 

shopp/trunk/core/flow/Warehouse.php

@@ -51 +51 @@
             wp_enqueue_script('postbox');
             wp_enqueue_script('wp-lists');
-            wp_enqueue_script('swfupload-all');
 
             if ( user_can_richedit() ) {
@@ -66 +65 @@
             shopp_enqueue_script('priceline');
             shopp_enqueue_script('ocupload');
+            shopp_enqueue_script('dropzone');
             shopp_enqueue_script('jquery-tmpl');
             shopp_enqueue_script('suggest');
@@ -168 +168 @@
             // Gracefully invalidate Shopp object caching
             Shopp::cache_invalidate();
-            
+
             $redirect = add_query_arg( $_GET, $adminurl );
             $redirect = remove_query_arg( array('action', 'selected', 'delete_all'), $redirect );
@@ -279 +279 @@
             'published'     =>  array('label' => Shopp::__('Published'),          'where' => array("p.post_status='publish'")),
             'drafts'        =>  array('label' => Shopp::__('Drafts'),             'where' => array("p.post_status='draft'")),
-            'trash'         =>  array('label' => Shopp::__('Trash'),              'where' => array("p.post_status='trash'")),           
+            'trash'         =>  array('label' => Shopp::__('Trash'),              'where' => array("p.post_status='trash'")),
             'onsale'        =>  array('label' => Shopp::__('On Sale'),            'where' => array("s.sale='on' AND p.post_status != 'trash'")),
             'featured'      =>  array('label' => Shopp::__('Featured'),           'where' => array("s.featured='on' AND p.post_status != 'trash'")),
@@ -351 +351 @@
                     $where[] = "(s.inventory='on' AND s.lowstock != 'none')";
                     break;
-                case "is": 
+                case "is":
                     $where[] = "(s.inventory='on' AND s.stock > 0)";
             }
@@ -414 +414 @@
             );
         } elseif ( 'sku' == $orderby ) {
-            $loading['joins'] = array_merge(array($pt => "LEFT JOIN $pt AS pt ON p.ID=pt.product"), $joins);            
+            $loading['joins'] = array_merge(array($pt => "LEFT JOIN $pt AS pt ON p.ID=pt.product"), $joins);
         }
 
@@ -693 +693 @@
             ksort($shiprates);
 
-        $uploader = shopp_setting('uploader_pref');
-        if ( ! $uploader ) $uploader = 'flash';
-
         $process = empty($Product->id) ? 'new' : $Product->id;
         $_POST['action'] = add_query_arg(array_merge($_GET, array('page' => $this->Admin->pagename('products'))), admin_url('admin.php'));
@@ -834 +831 @@
                     $priceline['stock'] = (int) $priceline['stocked'];
                     if ( ! isset($Price->stocklevel) ) $Price->stocklevel = $priceline['stock'];
-                    do_action('shopp_stock_product', $priceline['stock'], $Price, $Price->stock, $Price->stocklevel); 
+                    do_action('shopp_stock_product', $priceline['stock'], $Price, $Price->stock, $Price->stocklevel);
                 } else unset($priceline['stocked']);
 
@@ -991 +988 @@
 
     /**
-     * AJAX behavior to process uploaded files intended as digital downloads
+     * AJAX behavior to process uploaded files intended as digital product downloads
      *
      * Handles processing a file upload from a temporary file to a
      * the correct storage container (DB, file system, etc)
      *
-     * @author Jonathan Davis
+     * @since 1.3
+     * @param array $file File upload data
+     * @param array $data Posted data
      * @return string JSON encoded result with DB id, filename, type & size
      **/
-    public static function downloads () {
-
-        $error = false;
-        if ( isset($_FILES['Filedata']['error']) ) $error = $_FILES['Filedata']['error'];
-        if ( $error ) die( json_encode(array('error' => Lookup::errors('uploads', $error))) );
-
-        if ( ! @is_uploaded_file($_FILES['Filedata']['tmp_name']) )
-            die(json_encode(array('error' => Shopp::__('The file could not be saved because the upload was not found on the server.'))));
-
-        if ( 0 == $_FILES['Filedata']['size'] )
-            die(json_encode(array('error' => Shopp::__('The file could not be saved because the uploaded file is empty.'))));
+    public static function downloads ($file, $data) {
+
+        set_time_limit(0);        // Try to prevent timeouts
+        self::uploaderrs($file);  // Catch any upload errors before proceeding
+
+        $stagedfile = $file['tmp_name'];
+
+        // Handle chunked file uploads
+        if ( isset($data['dzchunkindex']) && isset($data['dztotalchunkcount']) ) {
+            $PartialUpload = new ShoppPartialUpload($file, $data);
+            $stagedfile = $PartialUpload->process();
+        }
 
         FileAsset::mimetypes();
 
         // Save the uploaded file
-        $File = new ProductDownload();
-        $File->parent = 0;
-        $File->context = "price";
-        $File->type = "download";
-        $File->name = $_FILES['Filedata']['name'];
-        $File->filename = $File->name;
-
-        list($extension, $mimetype, $properfile) = wp_check_filetype_and_ext($_FILES['Filedata']['tmp_name'], $File->name);
-        if ( empty($mimetype) ) $mimetype = 'application/octet-stream';
-        $File->mime = $mimetype;
-
-        if ( ! empty($properfile) )
-            $File->name = $File->filename = $properfile;
-
-        $File->size = filesize($_FILES['Filedata']['tmp_name']);
-        $File->store($_FILES['Filedata']['tmp_name'], 'upload');
+        $DownloadFile = new ProductDownload();
+        $DownloadFile->parent = 0;
+        $DownloadFile->context = "price";
+        $DownloadFile->type = "download";
+        $DownloadFile->name = $file['name'];
+        $DownloadFile->filename = $DownloadFile->name;
+
+        $mimedata = wp_check_filetype_and_ext($stagedfile, $DownloadFile->name);
+        $DownloadFile->mime = ! empty($mimedata['type']) ? $mimedata['type'] : 'application/octet-stream';
+        if ( ! empty($mimedata['proper_filename']) )
+            $DownloadFile->name = $DownloadFile->filename = $mimedata['proper_filename'];
+
+        $DownloadFile->size = filesize($stagedfile);
+        $DownloadFile->store($stagedfile, 'file');
 
         $Error = ShoppErrors()->code('storage_engine_save');
         if ( ! empty($Error) )
-            die( json_encode( array('error' => $Error->message(true)) ) );
-
-        $File->save();
-
-        do_action('add_product_download', $File,$_FILES['Filedata']);
-
-        echo json_encode(array(
-            'id'    => $File->id,
-            'name'  => stripslashes($File->name),
-            'type'  => $File->mime,
-            'size'  => $File->size
-        ));
-    }
+            wp_die($Error->message(true), 500);
+
+        $DownloadFile->save();
+
+        do_action('add_product_download', $DownloadFile, $file);
+
+        header('Content-Type: application/json');
+        wp_die(json_encode(array(
+            'id' => $DownloadFile->id,
+            'name' => stripslashes($DownloadFile->name),
+            'type' => $DownloadFile->mime,
+            'size' => $DownloadFile->size
+        )));
+    }
+
+    /**
+     * Provide upload errors back to the browser
+     *
+     * @since 1.4
+     * @param array $file The uploaded file data
+     * @return boolean False if no errors, exits if there are errors
+     **/
+    private static function uploaderrs ($file) {
+        $error = array();
+
+        if ( ! empty($file['error']) )
+            $error[500] = ShoppLookup::errors('uploads', $file['error']);
+
+        if ( ! is_uploaded_file($file['tmp_name']) )
+            $error[500] = Shopp::__('The file could not be saved because the uploaded file was not found on the server.');
+
+        if ( ! is_readable($file['tmp_name']) )
+            $error[500] = Shopp::__('The file could not be saved because the web server does not have permission to read the upload from the server\'s temporary directory.');
+
+        if ( 0 == $file['size'] )
+            $error[400] = Shopp::__('The file could not be saved because the selected file is empty.');
+
+        if ( 0 == filesize($file['tmp_name']) )
+            $error[500] = Shopp::__('The file could not be saved because the uploaded file is empty.');
+
+        if ( ! empty($error) )
+            wp_die(current($error), key($error));
+
+        return false;
+    }
 
     /**
      * AJAX behavior to process uploaded images
      *
-     * @author Jonathan Davis
+     * @since 1.3
      * @return string JSON encoded result with thumbnail id and src
      **/
-    public static function images () {
-        $context = false;
-        $error = false;
-        $valid_contexts = array('product', 'category');
-
-        if ( isset($_FILES['Filedata']['error']) )
-            $error = $_FILES['Filedata']['error'];
-        if ( $error ) die( json_encode(array('error' => Lookup::errors('uploads', $error))) );
-
-        if ( isset($_REQUEST['type']) && in_array(strtolower($_REQUEST['type']), $valid_contexts ) ) {
-            $parent = $_REQUEST['parent'];
-            $context = strtolower($_REQUEST['type']);
-        }
-
-        if ( ! $context )
-            die(json_encode(array('error' => Shopp::__('The file could not be saved because the server cannot tell whether to attach the asset to a product or a category.'))));
-
-        if ( ! @is_uploaded_file($_FILES['Filedata']['tmp_name']) )
-            die(json_encode(array('error' => Shopp::__('The file could not be saved because the upload was not found on the server.'))));
-
-        if ( 0 == $_FILES['Filedata']['size'] )
-            die(json_encode(array('error' => Shopp::__('The file could not be saved because the uploaded file is empty.'))));
+    public static function images ($file, $parent = false, $context = false) {
+
+        $ContextClasses = array(
+            'category' => 'CategoryImage',
+            'product' => 'ProductImage'
+        );
+
+        if ( ! in_array(strtolower($context), array_keys($ContextClasses)) )
+            wp_die(Shopp::__('The file could not be saved because the request did not specify whether it is a product or a category image.'), 400);
+
+        self::uploaderrs($file);
 
         // Save the source image
-        if ( 'category' == $context )
-            $Image = new CategoryImage();
-        else $Image = new ProductImage();
-
+        $Image = new $ContextClasses[ $context ]();
         $Image->parent = $parent;
         $Image->type = 'image';
         $Image->name = 'original';
-        $Image->filename = $_FILES['Filedata']['name'];
-
-        $context = 'upload';
-        $tempfile = $_FILES['Filedata']['tmp_name'];
-
-        if ( ! @is_readable($tempfile) ) {
-
-            $context = 'file';
-            $tempfile = get_temp_dir() . $Image->filename;
-
-            if ( ! @move_uploaded_file($_FILES['Filedata']['tmp_name'], $tempfile) )
-                die(json_encode(array('error' => Shopp::__('The file could not be saved because the web server does not have permission to read the upload.'))));
-
-        }
-
-        list($Image->width, $Image->height, $Image->mime, $Image->attr) = getimagesize($tempfile);
+        $Image->filename = $file['name'];
+        list($Image->width, $Image->height, $Image->mime, $Image->attr) = getimagesize($file['tmp_name']);
         $Image->mime = image_type_to_mime_type($Image->mime);
-        $Image->size = filesize($tempfile);
-
-        if ( ! $Image->unique() ) die(json_encode(array('error' => Shopp::__('The image already exists, but a new filename could not be generated.'))));
-
-        $Image->store($tempfile, $context);
-
-        if( 'file' == $context )
-            unlink($tempfile);
-
+        $Image->size = filesize($file['tmp_name']);
+
+        if ( ! $Image->unique() )
+            wp_die(Shopp::__('Server error: the image already exists and a new file could not be generated.'), 500);
+
+        $Image->store($file['tmp_name'], 'upload');
         $Error = ShoppErrors()->code('storage_engine_save');
-        if ( ! empty($Error) ) die( json_encode( array('error' => $Error->message(true)) ) );
+        if ( ! empty($Error) )
+            wp_die($Error->message(true), 500);
 
         $Image->save();
 
         if ( empty($Image->id) )
-            die(json_encode(array('error' => Shopp::__('The image reference was not saved to the database.'))));
-
-        echo json_encode(array('id' => $Image->id));
-        exit;
+            wp_die(Shopp::__('The image reference was not saved to the database.'), 500);
+
+        header('Content-Type: application/json');
+        wp_die(json_encode(array('id' => $Image->id)));
     }
 

shopp/trunk/core/library/Core.php

@@ -974 +974 @@
             case 'json': return 'application/json';
             case 'xml': return 'application/xml';
-            case 'swf': return 'application/x-shockwave-flash';
 
             // images

shopp/trunk/core/library/Loader.php

@@ -572 +572 @@
     'shopppage' => '/flow/Pages.php',
     'shopppages' => '/flow/Pages.php',
+    'shopppartialupload' => '/library/PartialUpload.php',
     'shopppaymentoption' => '/model/Payments.php',
     'shopppayments' => '/model/Payments.php',

shopp/trunk/core/library/Version.php

@@ -19 +19 @@
 
     /** @type int MINOR The minor version number */
-    const MINOR = 3;
+    const MINOR = 4;
 
     /** @type int PATCH The maintenance patch version number */
-    const PATCH = 13;
+    const PATCH = 0;
 
     /** @type string PRERELEASE The prerelease designation (dev, beta, RC1) */
@@ -28 +28 @@
 
     /** @type string CODENAME The release project code name */
-    const CODENAME = 'Cymru';
+    const CODENAME = 'Neptune';
 
     /** @type int DB The database schema version */

shopp/trunk/core/model/Tax.php

@@ -63 +63 @@
         if ( ! shopp_setting_enabled('taxes') ) return false;
 
-        $eu        = false;    // Track EU tax key
-        $override  =  array(); // Track taxrate overrides
+        $eukeys    = array();  // Track EUVAT keys
+        $override  = array();  // Track EU country VAT overrides
         $taxrates  = shopp_setting('taxrates');
         $fallbacks = array();
@@ -103 +103 @@
             $settings[ $key ] = $setting;
 
-            if ( self::EUVAT == $country ) $eu = $key;
+            if ( self::EUVAT == $country ) $eukeys[] = $key; 
             if ( in_array($country, Lookup::country_euvat()) ) $override[ $key ] = $country;
         }
@@ -110 +110 @@
             $settings = $fallbacks;
 
-        if ( false !== $eu && ! empty($override) ) unset($settings[ $eu ]) ;
+        if ( count($eukeys) > 0 && count($override) > 0 ) {
+            // Overall EUVAT and EUVAT for specific EU country detected, unset overall EUVAT 
+            foreach ( $eukeys as $eukey )
+                unset($settings[ $eukey ]) ;
+                }
+
+        if ( count($eukeys) > 1 ) {
+            //Multiple EUVAT detected, unset least specific ones
+            $arr = array();
+            foreach ( $eukeys as $eukey ){
+                $score = 0;
+                if ( ! empty($settings[ $eukey ]['zone']) ) $score++;
+                if ( ! empty($settings[ $eukey ]['rules']) ) $score++;
+                $arr[ $score ] = $eukey;
+            }
+
+            $eukeys = array_slice($arr, 0, count($arr)-1 );
+
+            foreach ( $eukeys as $eukey )
+                unset($settings[ $eukey ]) ;
+        }
 
         $settings = apply_filters('shopp_cart_taxrate_settings', $settings); // @deprecated Use shopp_tax_rate_settings instead

shopp/trunk/core/ui/behaviors/calendar.js

@@ -320 +320 @@
     if ( input !== false && input.length > 0 ) {
         pos = input.offset();
-        pad = $('#wpadminbar').size() > 0 ? $('#wpadminbar').height() * -1 : 0;
+        pad = $('#wpadminbar').length > 0 ? $('#wpadminbar').height() * -1 : 0;
 
         if (pos.left+pos.top == 0) {

shopp/trunk/core/ui/behaviors/calendar.min.js

@@ -1 @@
-jQuery.fn.PopupCalendar=function(e){var t=jQuery,n=this,a=t(this),s={month:(new Date).getMonth()+1,year:(new Date).getFullYear(),selection:!1,m_input:!1,d_input:!1,y_input:!1,input:!1,startWeek:0,title:"my",scheduling:!0,scheduleAfter:!1,disabled:"disabled",scopeMonth:"month",active:"active",selected:"selected",hover:"hover",autoinit:!1},e=t.extend(s,e),l=new Array(new Array(0,31,28,31,30,31,30,31,31,30,31,30,31),new Array(0,31,29,31,30,31,30,31,31,30,31,30,31)),i=new Array("",$cal.jan,$cal.feb,$cal.mar,$cal.apr,$cal.may,$cal.jun,$cal.jul,$cal.aug,$cal.sep,$cal.oct,$cal.nov,$cal.dec),c=new Array($cal.sun,$cal.mon,$cal.tue,$cal.wed,$cal.thu,$cal.fri,$cal.sat),o=639787,r=11,u=42,d=4,p=6,h=new Array(30,31,1,2,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1),(-1)),f=new Date,g=new Array,v=new Array,y=(e.month,e.year,e.m_input),w=e.d_input,m=e.y_input,D=y?y:e.input,T=y?y.add(w).add(m):D,A=e.startWeek,M=e.title,$=e.autoinit,C=e.disabled,Y=e.scopeMonth,k=e.active,b=e.selected,F=e.hover;return f=new Date(f.getFullYear(),f.getMonth(),f.getDate()),n.scope=Y,n.scheduling=e.scheduling,n.selection=e.selection?e.selection:f,n.ui=!1,a.mouseenter(function(){n.ui=!0}).mouseleave(function(){n.ui=!1}),n.change(function(){return D!==!1&&D.val(n.selection.getMonth()+1+"/"+n.selection.getDate()+"/"+n.selection.getFullYear()),y!==!1&&y.val(n.selection.getMonth()+1),w!==!1&&w.val(n.selection.getDate()),m!==!1&&m.val(n.selection.getFullYear()),n.focused&&n.focused.select(),this}),n.bind("updated",function(){var e=!1;y!==!1&&""!=y.val()&&""!=w.val()&&""!=m.val()?n.select(new Date(m.val(),y.val()-1,w.val())):D!==!1&&(e=D.val().match(/^(\d{1,2}).{1}(\d{1,2}).{1}(\d{4})/),e&&n.select(new Date(e[3],e[1]-1,e[2])))}),n.select=function(e){e&&(e instanceof Date?n.selection=e:n.selection=new Date(e)),n.change().render(n.selection.getMonth()+1,n.selection.getFullYear()).autoselect()},n.render=function(s,l){a.empty();var o,r,u,d,p,h,y,w,m=0,D=0,T=0,$=!1,_=new Array,S=new Array;for(s||(s=n.selection.getMonth()+1),l||(l=n.selection.getFullYear()),v=this.getDayMap(s,l,A,!0),e.scheduleAfter.selection&&($=e.scheduleAfter.selection),e.scheduleAfter===!1&&($=f),o=t('<span class="back">&#9664;</span>').appendTo(a),r=new Date(l,s-1,0),(!n.scheduling||n.scheduling&&r.getTime()>=$.getTime())&&o.click(function(){n.scope=Y,n.selection=new Date(l,s-2),n.render(n.selection.getMonth()+1,n.selection.getFullYear()),n.change()}),u=t('<span class="next">&#9654;</span>').click(function(){n.scope=Y,n.selection=new Date(l,s),n.render(n.selection.getMonth()+1,n.selection.getFullYear()),n.change()}).appendTo(a),d=t("<h3></h3>").appendTo(a),m=0;m<M.length;m++)-1!=t.inArray(M[m],["m","n","M","F"])&&t('<span class="month">'+i[s]+"</span>").appendTo(d),-1!=t.inArray(M[m],["y","Y"])&&t('<span class="year">'+l.toString()+"</span>").appendTo(d),t("<span> </span>").appendTo(d);for(S[D]=t('<div class="week"></week>').appendTo(a),T=A,m=0;m<7;m++)p=c[T],_[m]=t('<div class="label">'+p.substr(0,3)+"</span>").appendTo(S[D]),T++,T>=c.length&&(T=0);for(m=0;m<v.length;m++){var h=v[m].getMonth()+1,y=v[m].getFullYear(),w=new Date(y,h-1,v[m].getDate());m%7==0&&(S[++D]=t('<div class="week"></div>').appendTo(a)),v[m]!=-1&&(g[m]=t('<div title="'+m+'">'+w.getDate()+"</div>").appendTo(S[D]),g[m].date=w,h!=s&&g[m].addClass(C),n.scheduling&&w.getTime()<$.getTime()&&g[m].addClass(C),w.getTime()==f.getTime()&&g[m].addClass("today"),g[m].hover(function(){t(this).addClass(F)},function(){t(this).removeClass(F)}),g[m].mousedown(function(){t(this).addClass(k)}),g[m].mouseup(function(){t(this).removeClass(k)}),(!n.scheduling||n.scheduling&&w.getTime()>=$.getTime())&&g[m].click(function(){n.resetCalendar(),t(this).hasClass(C)||t(this).addClass(b),n.select(v[t(this).attr("title")]),n.scope="day",n.selection.getMonth()+1!=s?(n.render(n.selection.getMonth()+1,n.selection.getFullYear()),n.autoselect()):(n.ui=!1,a.hide()),n.change().trigger("calendarSelect")}))}return this},n.autoselect=function(){for(var e=0;e<v.length;e++)if(v[e].getTime()==n.selection.getTime())return g[e].addClass(b)},n.resetCalendar=function(){for(var e=0;e<g.length;e++)g[e].removeClass(b)},n.getDayMap=function(e,t,a,s){var i,c,o,r,d,p,f=1,g=0,v=new Array,y=e-1==0?12:e-1,w=12==y?t-1:t;if(9==e&&1752==t)return h;for(i=0;i<u;i++)v.push(-1);if(c=l[n.is_leapyear(w)?1:0][y],o=l[n.is_leapyear(t)?1:0][e],r=n.dayInWeek(1,e,t,a),d=n.dayInWeek(1,e,t,a),s)for(;d--;)v[d]=new Date(w,y-1,(c--));for(;o--;)v[r++]=new Date(t,e-1,(f++));if(p=v.length-r,s)for(;g<p;)v[r++]=new Date(t,e,(++g));return v},n.dayInYear=function(e,t,a){var s,i=n.is_leapyear(a)?1:0;for(s=1;s<t;s++)e+=l[i][s];return e},n.dayInWeek=function(e,t,a,s){var l=365*(a-1)+n.leapYearsSinceBC(a-1)+n.dayInYear(e,t,a),i=d;return l<o&&(i=(l-1+p)%7),l>=o+r&&(i=(l-1+p-r)%7),i<=s?i+=7-s:i-=s},n.is_leapyear=function(e){return e<=1752?!(e%4):!(e%4)&&e%100>0||!(e%400)},n.centuriesSince1700=function(e){return e>1700?Math.floor(e/100)-17:0},n.quadCenturiesSince1700=function(e){return e>1600?Math.floor((e-1600)/400):0},n.leapYearsSinceBC=function(e){return Math.floor(e/4)-n.centuriesSince1700(e)+n.quadCenturiesSince1700(e)},D!==!1&&D.length>0&&(pos=D.offset(),pad=t("#wpadminbar").size()>0?t("#wpadminbar").height()*-1:0,pos.left+pos.top==0&&(pos=D.parent().parent().css("display","block").offset(),pad=6),a.css({left:pos.left+"px",top:pos.top+D.outerHeight(!0)+"px"}),y!==!1&&m.val()+y.val()+w.val()!=""&&(n.selection=new Date(m.val(),y.val()-1,w.val())),T.focus(function(e){var s=t(this).offset();a.css({left:s.left+"px",top:s.top+"px"}),n.show(),n.focused=t(this)}).click(function(){n.focused&&n.focused.focus().select()}).blur(function(e){n.ui?t(this).focus().select():n.hide()}).bind("change.input",function(){n.trigger("updated")}).trigger("change.input")),e.scheduleAfter.selection&&e.scheduleAfter.change(function(){n.render().autoselect()}),$&&n.change(),n.render().autoselect(),this};
+jQuery.fn.PopupCalendar=function(e){var t=jQuery,n=this,a=t(this),s={month:(new Date).getMonth()+1,year:(new Date).getFullYear(),selection:!1,m_input:!1,d_input:!1,y_input:!1,input:!1,startWeek:0,title:"my",scheduling:!0,scheduleAfter:!1,disabled:"disabled",scopeMonth:"month",active:"active",selected:"selected",hover:"hover",autoinit:!1},l=(e=t.extend(s,e),new Array(new Array(0,31,28,31,30,31,30,31,31,30,31,30,31),new Array(0,31,29,31,30,31,30,31,31,30,31,30,31))),i=new Array("",$cal.jan,$cal.feb,$cal.mar,$cal.apr,$cal.may,$cal.jun,$cal.jul,$cal.aug,$cal.sep,$cal.oct,$cal.nov,$cal.dec),c=new Array($cal.sun,$cal.mon,$cal.tue,$cal.wed,$cal.thu,$cal.fri,$cal.sat),o=new Array(30,31,1,2,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1),r=new Date,u=new Array,d=new Array,p=(e.month,e.year,e.m_input),h=e.d_input,f=e.y_input,g=p||e.input,v=p?p.add(h).add(f):g,y=e.startWeek,w=e.title,m=e.autoinit,D=e.disabled,T=e.scopeMonth,A=e.active,M=e.selected,$=e.hover;return r=new Date(r.getFullYear(),r.getMonth(),r.getDate()),n.scope=T,n.scheduling=e.scheduling,n.selection=e.selection?e.selection:r,n.ui=!1,a.mouseenter(function(){n.ui=!0}).mouseleave(function(){n.ui=!1}),n.change(function(){return!1!==g&&g.val(n.selection.getMonth()+1+"/"+n.selection.getDate()+"/"+n.selection.getFullYear()),!1!==p&&p.val(n.selection.getMonth()+1),!1!==h&&h.val(n.selection.getDate()),!1!==f&&f.val(n.selection.getFullYear()),n.focused&&n.focused.select(),this}),n.bind("updated",function(){var e=!1;!1!==p&&""!=p.val()&&""!=h.val()&&""!=f.val()?n.select(new Date(f.val(),p.val()-1,h.val())):!1!==g&&(e=g.val().match(/^(\d{1,2}).{1}(\d{1,2}).{1}(\d{4})/))&&n.select(new Date(e[3],e[1]-1,e[2]))}),n.select=function(e){e&&(e instanceof Date?n.selection=e:n.selection=new Date(e)),n.change().render(n.selection.getMonth()+1,n.selection.getFullYear()).autoselect()},n.render=function(s,l){a.empty();var o,p,h,f,g=0,v=0,m=0,C=!1,Y=new Array,k=new Array;for(s||(s=n.selection.getMonth()+1),l||(l=n.selection.getFullYear()),d=this.getDayMap(s,l,y,!0),e.scheduleAfter.selection&&(C=e.scheduleAfter.selection),!1===e.scheduleAfter&&(C=r),o=t('<span class="back">&#9664;</span>').appendTo(a),p=new Date(l,s-1,0),(!n.scheduling||n.scheduling&&p.getTime()>=C.getTime())&&o.click(function(){n.scope=T,n.selection=new Date(l,s-2),n.render(n.selection.getMonth()+1,n.selection.getFullYear()),n.change()}),t('<span class="next">&#9654;</span>').click(function(){n.scope=T,n.selection=new Date(l,s),n.render(n.selection.getMonth()+1,n.selection.getFullYear()),n.change()}).appendTo(a),h=t("<h3></h3>").appendTo(a),g=0;g<w.length;g++)-1!=t.inArray(w[g],["m","n","M","F"])&&t('<span class="month">'+i[s]+"</span>").appendTo(h),-1!=t.inArray(w[g],["y","Y"])&&t('<span class="year">'+l.toString()+"</span>").appendTo(h),t("<span> </span>").appendTo(h);for(k[v]=t('<div class="week"></week>').appendTo(a),m=y,g=0;g<7;g++)f=c[m],Y[g]=t('<div class="label">'+f.substr(0,3)+"</span>").appendTo(k[v]),++m>=c.length&&(m=0);for(g=0;g<d.length;g++){var b=d[g].getMonth()+1,F=d[g].getFullYear(),_=new Date(F,b-1,d[g].getDate());g%7==0&&(k[++v]=t('<div class="week"></div>').appendTo(a)),-1!=d[g]&&(u[g]=t('<div title="'+g+'">'+_.getDate()+"</div>").appendTo(k[v]),u[g].date=_,b!=s&&u[g].addClass(D),n.scheduling&&_.getTime()<C.getTime()&&u[g].addClass(D),_.getTime()==r.getTime()&&u[g].addClass("today"),u[g].hover(function(){t(this).addClass($)},function(){t(this).removeClass($)}),u[g].mousedown(function(){t(this).addClass(A)}),u[g].mouseup(function(){t(this).removeClass(A)}),(!n.scheduling||n.scheduling&&_.getTime()>=C.getTime())&&u[g].click(function(){n.resetCalendar(),t(this).hasClass(D)||t(this).addClass(M),n.select(d[t(this).attr("title")]),n.scope="day",n.selection.getMonth()+1!=s?(n.render(n.selection.getMonth()+1,n.selection.getFullYear()),n.autoselect()):(n.ui=!1,a.hide()),n.change().trigger("calendarSelect")}))}return this},n.autoselect=function(){for(var e=0;e<d.length;e++)if(d[e].getTime()==n.selection.getTime())return u[e].addClass(M)},n.resetCalendar=function(){for(var e=0;e<u.length;e++)u[e].removeClass(M)},n.getDayMap=function(e,t,a,s){var i,c,r,u,d,p,h=1,f=0,g=new Array,v=e-1==0?12:e-1,y=12==v?t-1:t;if(9==e&&1752==t)return o;for(i=0;i<42;i++)g.push(-1);if(c=l[n.is_leapyear(y)?1:0][v],r=l[n.is_leapyear(t)?1:0][e],u=n.dayInWeek(1,e,t,a),d=n.dayInWeek(1,e,t,a),s)for(;d--;)g[d]=new Date(y,v-1,c--);for(;r--;)g[u++]=new Date(t,e-1,h++);if(p=g.length-u,s)for(;f<p;)g[u++]=new Date(t,e,++f);return g},n.dayInYear=function(e,t,a){var s,i=n.is_leapyear(a)?1:0;for(s=1;s<t;s++)e+=l[i][s];return e},n.dayInWeek=function(e,t,a,s){var l=365*(a-1)+n.leapYearsSinceBC(a-1)+n.dayInYear(e,t,a),i=4;return l<639787&&(i=(l-1+6)%7),l>=639798&&(i=(l-1+6-11)%7),i<=s?i+=7-s:i-=s},n.is_leapyear=function(e){return e<=1752?!(e%4):!(e%4)&&e%100>0||!(e%400)},n.centuriesSince1700=function(e){return e>1700?Math.floor(e/100)-17:0},n.quadCenturiesSince1700=function(e){return e>1600?Math.floor((e-1600)/400):0},n.leapYearsSinceBC=function(e){return Math.floor(e/4)-n.centuriesSince1700(e)+n.quadCenturiesSince1700(e)},!1!==g&&g.length>0&&(pos=g.offset(),pad=t("#wpadminbar").size()>0?-1*t("#wpadminbar").height():0,pos.left+pos.top==0&&(pos=g.parent().parent().css("display","block").offset(),pad=6),a.css({left:pos.left+"px",top:pos.top+g.outerHeight(!0)+"px"}),!1!==p&&f.val()+p.val()+h.val()!=""&&(n.selection=new Date(f.val(),p.val()-1,h.val())),v.focus(function(e){var s=t(this).offset();a.css({left:s.left+"px",top:s.top+"px"}),n.show(),n.focused=t(this)}).click(function(){n.focused&&n.focused.focus().select()}).blur(function(e){n.ui?t(this).focus().select():n.hide()}).bind("change.input",function(){n.trigger("updated")}).trigger("change.input")),e.scheduleAfter.selection&&e.scheduleAfter.change(function(){n.render().autoselect()}),m&&n.change(),n.render().autoselect(),this};

shopp/trunk/core/ui/behaviors/colorbox.js

@@ -1 +1 @@
 /*!
-    Colorbox v1.4.27 - 2013-07-16
-    jQuery lightbox and modal window plugin
-    (c) 2013 Jack Moore - http://www.jacklmoore.com/colorbox
-    license: http://www.opensource.org/licenses/mit-license.php
+    Colorbox 1.6.4
+    license: MIT
+    http://www.jacklmoore.com/colorbox
 */
 (function ($, document, window) {
@@ -10 +9 @@
     // See http://jacklmoore.com/colorbox for details.
     defaults = {
+        // data sources
+        html: false,
+        photo: false,
+        iframe: false,
+        inline: false,
+
+        // behavior and appearance
         transition: "elastic",
         speed: 300,
@@ -23 +29 @@
         scalePhotos: true,
         scrolling: true,
-        inline: false,
-        html: false,
-        iframe: false,
-        fastIframe: true,
-        photo: false,
-        href: false,
-        title: false,
-        rel: false,
-        opacity: 0.7,
+        opacity: 0.9,
         preloading: true,
         className: false,
-
-        // alternate image paths for high-res displays
-        retinaImage: false,
-        retinaUrl: false,
-        retinaSuffix: '@2x.$1',
-
-        // internationalization
-        current: "image {current} of {total}",
-        previous: "previous",
-        next: "next",
-        close: "close",
-        xhrError: "This content failed to load.",
-        imgError: "This image failed to load.",
-
-        open: false,
-        returnFocus: true,
-        trapFocus: true,
-        reposition: true,
-        loop: true,
-        slideshow: false,
-        slideshowAuto: true,
-        slideshowSpeed: 2500,
-        slideshowStart: "start slideshow",
-        slideshowStop: "stop slideshow",
-        photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp)((#|\?).*)?$/i,
-
-        onOpen: false,
-        onLoad: false,
-        onComplete: false,
-        onCleanup: false,
-        onClosed: false,
-
         overlayClose: true,
         escKey: true,
@@ -75 +41 @@
         fixed: false,
         data: undefined,
-        closeButton: true
+        closeButton: true,
+        fastIframe: true,
+        open: false,
+        reposition: true,
+        loop: true,
+        slideshow: false,
+        slideshowAuto: true,
+        slideshowSpeed: 2500,
+        slideshowStart: "start slideshow",
+        slideshowStop: "stop slideshow",
+        photoRegex: /\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,
+
+        // alternate image paths for high-res displays
+        retinaImage: false,
+        retinaUrl: false,
+        retinaSuffix: '@2x.$1',
+
+        // internationalization
+        current: "image {current} of {total}",
+        previous: "previous",
+        next: "next",
+        close: "close",
+        xhrError: "This content failed to load.",
+        imgError: "This image failed to load.",
+
+        // accessbility
+        returnFocus: true,
+        trapFocus: true,
+
+        // callbacks
+        onOpen: false,
+        onLoad: false,
+        onComplete: false,
+        onCleanup: false,
+        onClosed: false,
+
+        rel: function() {
+            return this.rel;
+        },
+        href: function() {
+            // using this.href would give the absolute url, when the href may have been inteded as a selector (e.g. '#container')
+            return $(this).attr('href');
+        },
+        title: function() {
+            return this.title;
+        },
+        createImg: function() {
+            var img = new Image();
+            var attrs = $(this).data('cbox-img-attrs');
+
+            if (typeof attrs === 'object') {
+                $.each(attrs, function(key, val){
+                    img[key] = val;
+                });
+            }
+
+            return img;
+        },
+        createIframe: function() {
+            var iframe = document.createElement('iframe');
+            var attrs = $(this).data('cbox-iframe-attrs');
+
+            if (typeof attrs === 'object') {
+                $.each(attrs, function(key, val){
+                    iframe[key] = val;
+                });
+            }
+
+            if ('frameBorder' in iframe) {
+                iframe.frameBorder = 0;
+            }
+            if ('allowTransparency' in iframe) {
+                iframe.allowTransparency = "true";
+            }
+            iframe.name = (new Date()).getTime(); // give the iframe a unique name to prevent caching
+            iframe.allowFullscreen = true;
+
+            return iframe;
+        }
     },
 
@@ -112 +156 @@
     $close,
     $groupControls,
-    $events = $('<a/>'),
+    $events = $('<a/>'), // $({}) would be prefered, but there is an issue with jQuery 1.4.2
 
     // Variables for cached values or use across multiple functions
@@ -120 +164 @@
     loadedHeight,
     loadedWidth,
-    element,
     index,
     photo,
@@ -129 +172 @@
     publicMethod,
     div = "div",
-    className,
     requests = 0,
     previousCSS = {},
@@ -157 +199 @@
     function winheight() {
         return window.innerHeight ? window.innerHeight : $(window).height();
+    }
+
+    function Settings(element, options) {
+        if (options !== Object(options)) {
+            options = {};
+        }
+
+        this.cache = {};
+        this.el = element;
+
+        this.value = function(key) {
+            var dataAttr;
+
+            if (this.cache[key] === undefined) {
+                dataAttr = $(this.el).attr('data-cbox-'+key);
+
+                if (dataAttr !== undefined) {
+                    this.cache[key] = dataAttr;
+                } else if (options[key] !== undefined) {
+                    this.cache[key] = options[key];
+                } else if (defaults[key] !== undefined) {
+                    this.cache[key] = defaults[key];
+                }
+            }
+
+            return this.cache[key];
+        };
+
+        this.get = function(key) {
+            var value = this.value(key);
+            return $.isFunction(value) ? value.call(this.el, this) : value;
+        };
     }
 
@@ -176 +250 @@
     // There is a force photo option (photo: true) for hrefs that cannot be matched by the regex.
     function isImage(settings, url) {
-        return settings.photo || settings.photoRegex.test(url);
+        return settings.get('photo') || settings.get('photoRegex').test(url);
     }
 
     function retinaUrl(settings, url) {
-        return settings.retinaUrl && window.devicePixelRatio > 1 ? url.replace(settings.photoRegex, settings.retinaSuffix) : url;
+        return settings.get('retinaUrl') && window.devicePixelRatio > 1 ? url.replace(settings.get('photoRegex'), settings.get('retinaSuffix')) : url;
     }
 
     function trapFocus(e) {
-        if ('contains' in $box[0] && !$box[0].contains(e.target)) {
+        if ('contains' in $box[0] && !$box[0].contains(e.target) && e.target !== $overlay[0]) {
             e.stopPropagation();
             $box.focus();
@@ -190 +264 @@
     }
 
-    // Assigns function results to their respective properties
-    function makeSettings() {
-        var i,
-            data = $.data(element, colorbox);
-
-        if (data == null) {
-            settings = $.extend({}, defaults);
-            if (console && console.log) {
-                console.log('Error: cboxElement missing settings object');
+    function setClass(str) {
+        if (setClass.str !== str) {
+            $box.add($overlay).removeClass(setClass.str).addClass(str);
+            setClass.str = str;
+        }
+    }
+
+    function getRelated(rel) {
+        index = 0;
+
+        if (rel && rel !== false && rel !== 'nofollow') {
+            $related = $('.' + boxElement).filter(function () {
+                var options = $.data(this, colorbox);
+                var settings = new Settings(this, options);
+                return (settings.get('rel') === rel);
+            });
+            index = $related.index(settings.el);
+
+            // Check direct calls to Colorbox.
+            if (index === -1) {
+                $related = $related.add(settings.el);
+                index = $related.length - 1;
             }
         } else {
-            settings = $.extend({}, data);
-        }
-
-        for (i in settings) {
-            if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time.
-                settings[i] = settings[i].call(element);
-            }
-        }
-
-        settings.rel = settings.rel || element.rel || $(element).data('rel') || 'nofollow';
-        settings.href = settings.href || $(element).attr('href');
-        settings.title = settings.title || element.title;
-
-        if (typeof settings.href === "string") {
-            settings.href = $.trim(settings.href);
-        }
-    }
-
-    function trigger(event, callback) {
+            $related = $(settings.el);
+        }
+    }
+
+    function trigger(event) {
         // for external use
         $(document).trigger(event);
-
         // for internal use
-        $events.trigger(event);
-
-        if ($.isFunction(callback)) {
-            callback.call(element);
-        }
-    }
-
-    // Slideshow functionality
-    function slideshow() {
-        var
-        timeOut,
-        className = prefix + "Slideshow_",
-        click = "click." + prefix,
-        clear,
-        set,
-        start,
-        stop;
-
-        if (settings.slideshow && $related[1]) {
-            clear = function () {
-                clearTimeout(timeOut);
-            };
-
-            set = function () {
-                if (settings.loop || $related[index + 1]) {
-                    timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
-                }
-            };
-
-            start = function () {
-                $slideshow
-                    .html(settings.slideshowStop)
-                    .unbind(click)
-                    .one(click, stop);
-
-                $events
-                    .bind(event_complete, set)
-                    .bind(event_load, clear)
-                    .bind(event_cleanup, stop);
-
-                $box.removeClass(className + "off").addClass(className + "on");
-            };
-
-            stop = function () {
+        $events.triggerHandler(event);
+    }
+
+    var slideshow = (function(){
+        var active,
+            className = prefix + "Slideshow_",
+            click = "click." + prefix,
+            timeOut;
+
+        function clear () {
+            clearTimeout(timeOut);
+        }
+
+        function set() {
+            if (settings.get('loop') || $related[index + 1]) {
                 clear();
-
-                $events
-                    .unbind(event_complete, set)
-                    .unbind(event_load, clear)
-                    .unbind(event_cleanup, stop);
-
-                $slideshow
-                    .html(settings.slideshowStart)
-                    .unbind(click)
-                    .one(click, function () {
-                        publicMethod.next();
+                timeOut = setTimeout(publicMethod.next, settings.get('slideshowSpeed'));
+            }
+        }
+
+        function start() {
+            $slideshow
+                .html(settings.get('slideshowStop'))
+                .unbind(click)
+                .one(click, stop);
+
+            $events
+                .bind(event_complete, set)
+                .bind(event_load, clear);
+
+            $box.removeClass(className + "off").addClass(className + "on");
+        }
+
+        function stop() {
+            clear();
+
+            $events
+                .unbind(event_complete, set)
+                .unbind(event_load, clear);
+
+            $slideshow
+                .html(settings.get('slideshowStart'))
+                .unbind(click)
+                .one(click, function () {
+                    publicMethod.next();
+                    start();
+                });
+
+            $box.removeClass(className + "on").addClass(className + "off");
+        }
+
+        function reset() {
+            active = false;
+            $slideshow.hide();
+            clear();
+            $events
+                .unbind(event_complete, set)
+                .unbind(event_load, clear);
+            $box.removeClass(className + "off " + className + "on");
+        }
+
+        return function(){
+            if (active) {
+                if (!settings.get('slideshow')) {
+                    $events.unbind(event_cleanup, reset);
+                    reset();
+                }
+            } else {
+                if (settings.get('slideshow') && $related[1]) {
+                    active = true;
+                    $events.one(event_cleanup, reset);
+                    if (settings.get('slideshowAuto')) {
                         start();
-                    });
-
-                $box.removeClass(className + "on").addClass(className + "off");
-            };
-
-            if (settings.slideshowAuto) {
-                start();
-            } else {
-                stop();
-            }
-        } else {
-            $box.removeClass(className + "off " + className + "on");
-        }
-    }
-
-    function launch(target) {
+                    } else {
+                        stop();
+                    }
+                    $slideshow.show();
+                }
+            }
+        };
+
+    }());
+
+
+    function launch(element) {
+        var options;
+
         if (!closing) {
 
-            element = target;
-
-            makeSettings();
-
-            $related = $(element);
-
-            index = 0;
-
-            if (settings.rel !== 'nofollow') {
-                $related = $('.' + boxElement).filter(function () {
-                    var data = $.data(this, colorbox),
-                        relRelated;
-
-                    if (data) {
-                        relRelated =  $(this).data('rel') || data.rel || this.rel;
-                    }
-
-                    return (relRelated === settings.rel);
-                });
-                index = $related.index(element);
-
-                // Check direct calls to Colorbox.
-                if (index === -1) {
-                    $related = $related.add(element);
-                    index = $related.length - 1;
-                }
-            }
-
-            $overlay.css({
-                opacity: parseFloat(settings.opacity),
-                cursor: settings.overlayClose ? "pointer" : "auto",
-                visibility: 'visible'
-            }).show();
-
-
-            if (className) {
-                $box.add($overlay).removeClass(className);
-            }
-            if (settings.className) {
-                $box.add($overlay).addClass(settings.className);
-            }
-            className = settings.className;
-
-            if (settings.closeButton) {
-                $close.html(settings.close).appendTo($content);
-            } else {
-                $close.appendTo('<div/>');
-            }
+            options = $(element).data(colorbox);
+
+            settings = new Settings(element, options);
+
+            getRelated(settings.get('rel'));
 
             if (!open) {
                 open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
 
+                setClass(settings.get('className'));
+
                 // Show colorbox so the sizes can be calculated in older versions of jQuery
-                $box.css({visibility:'hidden', display:'block'});
-
-                $loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden');
+                $box.css({visibility:'hidden', display:'block', opacity:''});
+
+                $loaded = $tag(div, 'LoadedContent', 'width:0; height:0; overflow:hidden; visibility:hidden');
                 $content.css({width:'', height:''}).append($loaded);
 
@@ -364 +409 @@
 
                 // Opens inital empty Colorbox prior to content being loaded.
-                settings.w = setSize(settings.initialWidth, 'x');
-                settings.h = setSize(settings.initialHeight, 'y');
+                var initialWidth = setSize(settings.get('initialWidth'), 'x');
+                var initialHeight = setSize(settings.get('initialHeight'), 'y');
+                var maxWidth = settings.get('maxWidth');
+                var maxHeight = settings.get('maxHeight');
+
+                settings.w = Math.max((maxWidth !== false ? Math.min(initialWidth, setSize(maxWidth, 'x')) : initialWidth) - loadedWidth - interfaceWidth, 0);
+                settings.h = Math.max((maxHeight !== false ? Math.min(initialHeight, setSize(maxHeight, 'y')) : initialHeight) - loadedHeight - interfaceHeight, 0);
+
+                $loaded.css({width:'', height:settings.h});
                 publicMethod.position();
 
-                slideshow();
-
-                trigger(event_open, settings.onOpen);
+                trigger(event_open);
+                settings.get('onOpen');
 
                 $groupControls.add($title).hide();
@@ -376 +427 @@
                 $box.focus();
 
-
-                if (settings.trapFocus) {
+                if (settings.get('trapFocus')) {
                     // Confine focus to the modal
                     // Uses event capturing that is not supported in IE8-
@@ -391 +441 @@
 
                 // Return focus on closing
-                if (settings.returnFocus) {
+                if (settings.get('returnFocus')) {
                     $events.one(event_closed, function () {
-                        $(element).focus();
+                        $(settings.el).focus();
                     });
                 }
+            }
+
+            var opacity = parseFloat(settings.get('opacity'));
+            $overlay.css({
+                opacity: opacity === opacity ? opacity : '',
+                cursor: settings.get('overlayClose') ? 'pointer' : '',
+                visibility: 'visible'
+            }).show();
+
+            if (settings.get('closeButton')) {
+                $close.html(settings.get('close')).appendTo($content);
+            } else {
+                $close.appendTo('<div/>'); // replace with .detach() when dropping jQuery < 1.4
             }
 
@@ -405 +468 @@
     // so that the browser will go ahead and load the CSS background images.
     function appendHTML() {
-        if (!$box && document.body) {
+        if (!$box) {
             init = false;
             $window = $(window);
@@ -422 +485 @@
                 $prev = $('<button type="button"/>').attr({id:prefix+'Previous'}),
                 $next = $('<button type="button"/>').attr({id:prefix+'Next'}),
-                $slideshow = $tag('button', "Slideshow"),
+                $slideshow = $('<button type="button"/>').attr({id:prefix+'Slideshow'}),
                 $loadingOverlay
             );
@@ -446 +509 @@
             ).find('div div').css({'float': 'left'});
 
-            $loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none');
+            $loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;');
 
             $groupControls = $next.add($prev).add($current).add($slideshow);
-
+        }
+        if (document.body && !$box.parent().length) {
             $(document.body).append($overlay, $box.append($wrap, $loadingBay));
         }
@@ -480 +544 @@
                 });
                 $overlay.click(function () {
-                    if (settings.overlayClose) {
+                    if (settings.get('overlayClose')) {
                         publicMethod.close();
                     }
@@ -488 +552 @@
                 $(document).bind('keydown.' + prefix, function (e) {
                     var key = e.keyCode;
-                    if (open && settings.escKey && key === 27) {
+                    if (open && settings.get('escKey') && key === 27) {
                         e.preventDefault();
                         publicMethod.close();
                     }
-                    if (open && settings.arrowKey && $related[1] && !e.altKey) {
+                    if (open && settings.get('arrowKey') && $related[1] && !e.altKey) {
                         if (key === 37) {
                             e.preventDefault();
@@ -519 +583 @@
 
     // Don't do anything if Colorbox already exists.
-    if ($.colorbox) {
+    if ($[colorbox]) {
         return;
     }
@@ -534 +598 @@
 
     publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) {
-        var $this = this;
+        var settings;
+        var $obj = this;
 
         options = options || {};
 
+        if ($.isFunction($obj)) { // assume a call to $.colorbox
+            $obj = $('<a/>');
+            options.open = true;
+        }
+
+        if (!$obj[0]) { // colorbox being applied to empty collection
+            return $obj;
+        }
+
         appendHTML();
 
         if (addBindings()) {
-            if ($.isFunction($this)) { // assume a call to $.colorbox
-                $this = $('<a/>');
-                options.open = true;
-            } else if (!$this[0]) { // colorbox being applied to empty collection
-                return $this;
-            }
 
             if (callback) {
@@ -552 +620 @@
             }
 
-            $this.each(function () {
-                $.data(this, colorbox, $.extend({}, $.data(this, colorbox) || defaults, options));
+            $obj.each(function () {
+                var old = $.data(this, colorbox) || {};
+                $.data(this, colorbox, $.extend(old, options));
             }).addClass(boxElement);
 
-            if (($.isFunction(options.open) && options.open.call($this)) || options.open) {
-                launch($this[0]);
-            }
-        }
-
-        return $this;
+            settings = new Settings($obj[0], options);
+
+            if (settings.get('open')) {
+                launch($obj[0]);
+            }
+        }
+
+        return $obj;
     };
 
@@ -581 +652 @@
         scrollLeft = $window.scrollLeft();
 
-        if (settings.fixed) {
+        if (settings.get('fixed')) {
             offset.top -= scrollTop;
             offset.left -= scrollLeft;
@@ -592 +663 @@
 
         // keeps the top and left positions within the browser's viewport.
-        if (settings.right !== false) {
-            left += Math.max($window.width() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0);
-        } else if (settings.left !== false) {
-            left += setSize(settings.left, 'x');
+        if (settings.get('right') !== false) {
+            left += Math.max($window.width() - settings.w - loadedWidth - interfaceWidth - setSize(settings.get('right'), 'x'), 0);
+        } else if (settings.get('left') !== false) {
+            left += setSize(settings.get('left'), 'x');
         } else {
             left += Math.round(Math.max($window.width() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
         }
 
-        if (settings.bottom !== false) {
-            top += Math.max(winheight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.bottom, 'y'), 0);
-        } else if (settings.top !== false) {
-            top += setSize(settings.top, 'y');
+        if (settings.get('bottom') !== false) {
+            top += Math.max(winheight() - settings.h - loadedHeight - interfaceHeight - setSize(settings.get('bottom'), 'y'), 0);
+        } else if (settings.get('top') !== false) {
+            top += setSize(settings.get('top'), 'y');
         } else {
             top += Math.round(Math.max(winheight() - settings.h - loadedHeight - interfaceHeight, 0) / 2);
@@ -651 +722 @@
                 $wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px";
 
-                if (settings.reposition) {
+                if (settings.get('reposition')) {
                     setTimeout(function () {  // small delay before binding onresize due to an IE8 bug.
                         $window.bind('resize.' + prefix, publicMethod.position);
@@ -657 +728 @@
                 }
 
-                if (loadedCallback) {
+                if ($.isFunction(loadedCallback)) {
                     loadedCallback();
                 }
@@ -701 +772 @@
             }
 
-            publicMethod.position(settings.transition === "none" ? 0 : settings.speed);
+            publicMethod.position(settings.get('transition') === "none" ? 0 : settings.get('speed'));
         }
     };
@@ -710 +781 @@
         }
 
-        var callback, speed = settings.transition === "none" ? 0 : settings.speed;
-
-        $loaded.empty().remove(); // Using empty first may prevent some IE7 issues.
+        var callback, speed = settings.get('transition') === "none" ? 0 : settings.get('speed');
+
+        $loaded.remove();
 
         $loaded = $tag(div, 'LoadedContent').append(object);
@@ -729 +800 @@
         $loaded.hide()
         .appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
-        .css({width: getWidth(), overflow: settings.scrolling ? 'auto' : 'hidden'})
+        .css({width: getWidth(), overflow: settings.get('scrolling') ? 'auto' : 'hidden'})
         .css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
         .prependTo($content);
@@ -738 +809 @@
 
         $(photo).css({'float': 'none'});
+
+        setClass(settings.get('className'));
 
         callback = function () {
             var total = $related.length,
                 iframe,
-                frameBorder = 'frameBorder',
-                allowTransparency = 'allowTransparency',
                 complete;
 
@@ -750 +821 @@
             }
 
-            function removeFilter() { // Needed for IE7 & IE8 in versions of jQuery prior to 1.7.2
+            function removeFilter() { // Needed for IE8 in versions of jQuery prior to 1.7.2
                 if ($.support.opacity === false) {
                     $box[0].style.removeAttribute('filter');
@@ -759 +830 @@
                 clearTimeout(loadingTimer);
                 $loadingOverlay.hide();
-                trigger(event_complete, settings.onComplete);
+                trigger(event_complete);
+                settings.get('onComplete');
             };
 
-            $title.html(settings.title).add($loaded).show();
+
+            $title.html(settings.get('title')).show();
+            $loaded.show();
 
             if (total > 1) { // handle grouping
-                if (typeof settings.current === "string") {
-                    $current.html(settings.current.replace('{current}', index + 1).replace('{total}', total)).show();
-                }
-
-                $next[(settings.loop || index < total - 1) ? "show" : "hide"]().html(settings.next);
-                $prev[(settings.loop || index) ? "show" : "hide"]().html(settings.previous);
-
-                if (settings.slideshow) {
-                    $slideshow.show();
-                }
+                if (typeof settings.get('current') === "string") {
+                    $current.html(settings.get('current').replace('{current}', index + 1).replace('{total}', total)).show();
+                }
+
+                $next[(settings.get('loop') || index < total - 1) ? "show" : "hide"]().html(settings.get('next'));
+                $prev[(settings.get('loop') || index) ? "show" : "hide"]().html(settings.get('previous'));
+
+                slideshow();
 
                 // Preloads images within a rel group
-                if (settings.preloading) {
+                if (settings.get('preloading')) {
                     $.each([getIndex(-1), getIndex(1)], function(){
-                        var src,
-                            img,
+                        var img,
                             i = $related[this],
-                            data = $.data(i, colorbox);
-
-                        if (data && data.href) {
-                            src = data.href;
-                            if ($.isFunction(src)) {
-                                src = src.call(i);
-                            }
-                        } else {
-                            src = $(i).attr('href');
-                        }
-
-                        if (src && isImage(data, src)) {
-                            src = retinaUrl(data, src);
+                            settings = new Settings(i, $.data(i, colorbox)),
+                            src = settings.get('href');
+
+                        if (src && isImage(settings, src)) {
+                            src = retinaUrl(settings, src);
                             img = document.createElement('img');
                             img.src = src;
@@ -804 +867 @@
             }
 
-            if (settings.iframe) {
-                iframe = $tag('iframe')[0];
-
-                if (frameBorder in iframe) {
-                    iframe[frameBorder] = 0;
-                }
-
-                if (allowTransparency in iframe) {
-                    iframe[allowTransparency] = "true";
-                }
-
-                if (!settings.scrolling) {
+            if (settings.get('iframe')) {
+
+                iframe = settings.get('createIframe');
+
+                if (!settings.get('scrolling')) {
                     iframe.scrolling = "no";
                 }
@@ -821 +877 @@
                 $(iframe)
                     .attr({
-                        src: settings.href,
-                        name: (new Date()).getTime(), // give the iframe a unique name to prevent caching
-                        'class': prefix + 'Iframe',
-                        allowFullScreen : true, // allow HTML5 video to go fullscreen
-                        webkitAllowFullScreen : true,
-                        mozallowfullscreen : true
+                        src: settings.get('href'),
+                        'class': prefix + 'Iframe'
                     })
                     .one('load', complete)
@@ -835 +887 @@
                 });
 
-                if (settings.fastIframe) {
+                if (settings.get('fastIframe')) {
                     $(iframe).trigger('load');
                 }
@@ -842 +894 @@
             }
 
-            if (settings.transition === 'fade') {
+            if (settings.get('transition') === 'fade') {
                 $box.fadeTo(speed, 1, removeFilter);
             } else {
@@ -849 +901 @@
         };
 
-        if (settings.transition === 'fade') {
+        if (settings.get('transition') === 'fade') {
             $box.fadeTo(speed, 0, function () {
                 publicMethod.position(0, callback);
@@ -865 +917 @@
         photo = false;
 
-        element = $related[index];
-
-        makeSettings();
-
         trigger(event_purge);
-
-        trigger(event_load, settings.onLoad);
-
-        settings.h = settings.height ?
-                setSize(settings.height, 'y') - loadedHeight - interfaceHeight :
-                settings.innerHeight && setSize(settings.innerHeight, 'y');
-
-        settings.w = settings.width ?
-                setSize(settings.width, 'x') - loadedWidth - interfaceWidth :
-                settings.innerWidth && setSize(settings.innerWidth, 'x');
+        trigger(event_load);
+        settings.get('onLoad');
+
+        settings.h = settings.get('height') ?
+                setSize(settings.get('height'), 'y') - loadedHeight - interfaceHeight :
+                settings.get('innerHeight') && setSize(settings.get('innerHeight'), 'y');
+
+        settings.w = settings.get('width') ?
+                setSize(settings.get('width'), 'x') - loadedWidth - interfaceWidth :
+                settings.get('innerWidth') && setSize(settings.get('innerWidth'), 'x');
 
         // Sets the minimum dimensions for use in image scaling
@@ -887 +935 @@
         // Re-evaluate the minimum width and height based on maxWidth and maxHeight values.
         // If the width or height exceed the maxWidth or maxHeight, use the maximum values instead.
-        if (settings.maxWidth) {
-            settings.mw = setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth;
+        if (settings.get('maxWidth')) {
+            settings.mw = setSize(settings.get('maxWidth'), 'x') - loadedWidth - interfaceWidth;
             settings.mw = settings.w && settings.w < settings.mw ? settings.w : settings.mw;
         }
-        if (settings.maxHeight) {
-            settings.mh = setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight;
+        if (settings.get('maxHeight')) {
+            settings.mh = setSize(settings.get('maxHeight'), 'y') - loadedHeight - interfaceHeight;
             settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh;
         }
 
-        href = settings.href;
+        href = settings.get('href');
 
         loadingTimer = setTimeout(function () {
@@ -902 +950 @@
         }, 100);
 
-        if (settings.inline) {
+        if (settings.get('inline')) {
+            var $target = $(href).eq(0);
             // Inserts an empty placeholder where inline content is being pulled from.
             // An event is bound to put inline content back when Colorbox closes or loads new content.
-            $inline = $tag(div).hide().insertBefore($(href)[0]);
+            $inline = $('<div>').hide().insertBefore($target);
 
             $events.one(event_purge, function () {
-                $inline.replaceWith($loaded.children());
+                $inline.replaceWith($target);
             });
 
-            prep($(href));
-        } else if (settings.iframe) {
+            prep($target);
+        } else if (settings.get('iframe')) {
             // IFrame element won't be added to the DOM until it is ready to be displayed,
             // to avoid problems with DOM-ready JS that might be trying to run in that iframe.
             prep(" ");
-        } else if (settings.html) {
-            prep(settings.html);
+        } else if (settings.get('html')) {
+            prep(settings.get('html'));
         } else if (isImage(settings, href)) {
 
             href = retinaUrl(settings, href);
 
-            photo = document.createElement('img');
+            photo = settings.get('createImg');
 
             $(photo)
             .addClass(prefix + 'Photo')
-            .bind('error',function () {
-                settings.title = false;
-                prep($tag(div, 'Error').html(settings.imgError));
+            .bind('error.'+prefix,function () {
+                prep($tag(div, 'Error').html(settings.get('imgError')));
             })
             .one('load', function () {
-                var percent;
-
                 if (request !== requests) {
                     return;
                 }
 
-                photo.alt = $(element).attr('alt') || $(element).attr('data-alt') || '';
-
-                if (settings.retinaImage && window.devicePixelRatio > 1) {
-                    photo.height = photo.height / window.devicePixelRatio;
-                    photo.width = photo.width / window.devicePixelRatio;
-                }
-
-                if (settings.scalePhotos) {
-                    setResize = function () {
-                        photo.height -= photo.height * percent;
-                        photo.width -= photo.width * percent;
-                    };
-                    if (settings.mw && photo.width > settings.mw) {
-                        percent = (photo.width - settings.mw) / photo.width;
-                        setResize();
+                // A small pause because some browsers will occassionaly report a
+                // img.width and img.height of zero immediately after the img.onload fires
+                setTimeout(function(){
+                    var percent;
+
+                    if (settings.get('retinaImage') && window.devicePixelRatio > 1) {
+                        photo.height = photo.height / window.devicePixelRatio;
+                        photo.width = photo.width / window.devicePixelRatio;
                     }
-                    if (settings.mh && photo.height > settings.mh) {
-                        percent = (photo.height - settings.mh) / photo.height;
-                        setResize();
+
+                    if (settings.get('scalePhotos')) {
+                        setResize = function () {
+                            photo.height -= photo.height * percent;
+                            photo.width -= photo.width * percent;
+                        };
+                        if (settings.mw && photo.width > settings.mw) {
+                            percent = (photo.width - settings.mw) / photo.width;
+                            setResize();
+                        }
+                        if (settings.mh && photo.height > settings.mh) {
+                            percent = (photo.height - settings.mh) / photo.height;
+                            setResize();
+                        }
                     }
-                }
-
-                if (settings.h) {
-                    photo.style.marginTop = Math.max(settings.mh - photo.height, 0) / 2 + 'px';
-                }
-
-                if ($related[1] && (settings.loop || $related[index + 1])) {
-                    photo.style.cursor = 'pointer';
-                    photo.onclick = function () {
-                        publicMethod.next();
-                    };
-                }
-
-                photo.style.width = photo.width + 'px';
-                photo.style.height = photo.height + 'px';
-
-                setTimeout(function () { // A pause because Chrome will sometimes report a 0 by 0 size otherwise.
+
+                    if (settings.h) {
+                        photo.style.marginTop = Math.max(settings.mh - photo.height, 0) / 2 + 'px';
+                    }
+
+                    if ($related[1] && (settings.get('loop') || $related[index + 1])) {
+                        photo.style.cursor = 'pointer';
+
+                        $(photo).bind('click.'+prefix, function () {
+                            publicMethod.next();
+                        });
+                    }
+
+                    photo.style.width = photo.width + 'px';
+                    photo.style.height = photo.height + 'px';
                     prep(photo);
                 }, 1);
             });
 
-            setTimeout(function () { // A pause because Opera 10.6+ will sometimes not run the onload function otherwise.
-                photo.src = href;
-            }, 1);
+            photo.src = href;
+
         } else if (href) {
-            $loadingBay.load(href, settings.data, function (data, status) {
+            $loadingBay.load(href, settings.get('data'), function (data, status) {
                 if (request === requests) {
-                    prep(status === 'error' ? $tag(div, 'Error').html(settings.xhrError) : $(this).contents());
+                    prep(status === 'error' ? $tag(div, 'Error').html(settings.get('xhrError')) : $(this).contents());
                 }
             });
@@ -992 +1039 @@
     // Navigates to the next page/image in a set.
     publicMethod.next = function () {
-        if (!active && $related[1] && (settings.loop || $related[index + 1])) {
+        if (!active && $related[1] && (settings.get('loop') || $related[index + 1])) {
             index = getIndex(1);
             launch($related[index]);
@@ -999 +1046 @@
 
     publicMethod.prev = function () {
-        if (!active && $related[1] && (settings.loop || index)) {
+        if (!active && $related[1] && (settings.get('loop') || index)) {
             index = getIndex(-1);
             launch($related[index]);
@@ -1010 +1057 @@
 
             closing = true;
-
             open = false;
-
-            trigger(event_cleanup, settings.onCleanup);
-
+            trigger(event_cleanup);
+            settings.get('onCleanup');
             $window.unbind('.' + prefix);
-
-            $overlay.fadeTo(settings.fadeOut || 0, 0);
-
-            $box.stop().fadeTo(settings.fadeOut || 0, 0, function () {
-
-                $box.add($overlay).css({'opacity': 1, cursor: 'auto'}).hide();
-
+            $overlay.fadeTo(settings.get('fadeOut') || 0, 0);
+
+            $box.stop().fadeTo(settings.get('fadeOut') || 0, 0, function () {
+                $box.hide();
+                $overlay.hide();
                 trigger(event_purge);
-
-                $loaded.empty().remove(); // Using empty first may prevent some IE7 issues.
+                $loaded.remove();
 
                 setTimeout(function () {
                     closing = false;
-                    trigger(event_closed, settings.onClosed);
+                    trigger(event_closed);
+                    settings.get('onClosed');
                 }, 1);
             });
         }
-    };
-
-    // Added by Jonathan Davis, Ingenesis Limited
-    publicMethod.hide = function () {
-        $overlay.fadeTo(settings.fadeOut || 0, 0);
-        $box.fadeTo(settings.fadeOut || 0, 0, function () {
-            $overlay.hide();
-            $box.css({'opacity': 1, cursor: 'auto','left':'-9999em'});
-            trigger(event_closed, settings.onClosed);
-        });
     };
 
@@ -1050 +1083 @@
 
         $box.stop();
-        $.colorbox.close();
-        $box.stop().remove();
+        $[colorbox].close();
+        $box.stop(false, true).remove();
         $overlay.remove();
         closing = false;
@@ -1059 +1092 @@
             .removeClass(boxElement);
 
-        $(document).unbind('click.'+prefix);
+        $(document).unbind('click.'+prefix).unbind('keydown.'+prefix);
     };
 
@@ -1065 +1098 @@
     // returns a jQuery object.
     publicMethod.element = function () {
-        return $(element);
+        return $(settings.el);
     };
 

shopp/trunk/core/ui/behaviors/colorbox.min.js

@@ -1 @@
-!function(e,t,i){function o(i,o,n){var r=t.createElement(i);return o&&(r.id=ee+o),n&&(r.style.cssText=n),e(r)}function n(){return i.innerHeight?i.innerHeight:e(i).height()}function r(e){var t=E.length,i=(j+e)%t;return i<0?t+i:i}function l(e,t){return Math.round((/%/.test(e)?("x"===t?H.width():n())/100:1)*parseInt(e,10))}function a(e,t){return e.photo||e.photoRegex.test(t)}function h(e,t){return e.retinaUrl&&i.devicePixelRatio>1?t.replace(e.photoRegex,e.retinaSuffix):t}function s(e){"contains"in v[0]&&!v[0].contains(e.target)&&(e.stopPropagation(),v.focus())}function d(){var t,i=e.data(A,Z);null==i?(B=e.extend({},Y),console&&console.log&&console.log("Error: cboxElement missing settings object")):B=e.extend({},i);for(t in B)e.isFunction(B[t])&&"on"!==t.slice(0,2)&&(B[t]=B[t].call(A));B.rel=B.rel||A.rel||e(A).data("rel")||"nofollow",B.href=B.href||e(A).attr("href"),B.title=B.title||A.title,"string"==typeof B.href&&(B.href=e.trim(B.href))}function c(i,o){e(t).trigger(i),he.trigger(i),e.isFunction(o)&&o.call(A)}function u(){var e,t,i,o,n,r=ee+"Slideshow_",l="click."+ee;B.slideshow&&E[1]?(t=function(){clearTimeout(e)},i=function(){(B.loop||E[j+1])&&(e=setTimeout(J.next,B.slideshowSpeed))},o=function(){R.html(B.slideshowStop).unbind(l).one(l,n),he.bind(ne,i).bind(oe,t).bind(re,n),v.removeClass(r+"off").addClass(r+"on")},n=function(){t(),he.unbind(ne,i).unbind(oe,t).unbind(re,n),R.html(B.slideshowStart).unbind(l).one(l,function(){J.next(),o()}),v.removeClass(r+"on").addClass(r+"off")},B.slideshowAuto?o():n()):v.removeClass(r+"off "+r+"on")}function f(i){G||(A=i,d(),E=e(A),j=0,"nofollow"!==B.rel&&(E=e("."+te).filter(function(){var t,i=e.data(this,Z);return i&&(t=e(this).data("rel")||i.rel||this.rel),t===B.rel}),j=E.index(A),j===-1&&(E=E.add(A),j=E.length-1)),g.css({opacity:parseFloat(B.opacity),cursor:B.overlayClose?"pointer":"auto",visibility:"visible"}).show(),V&&v.add(g).removeClass(V),B.className&&v.add(g).addClass(B.className),V=B.className,B.closeButton?O.html(B.close).appendTo(x):O.appendTo("<div/>"),$||($=q=!0,v.css({visibility:"hidden",display:"block"}),W=o(se,"LoadedContent","width:0; height:0; overflow:hidden"),x.css({width:"",height:""}).append(W),_=b.height()+k.height()+x.outerHeight(!0)-x.height(),D=T.width()+C.width()+x.outerWidth(!0)-x.width(),N=W.outerHeight(!0),z=W.outerWidth(!0),B.w=l(B.initialWidth,"x"),B.h=l(B.initialHeight,"y"),J.position(),u(),c(ie,B.onOpen),P.add(S).hide(),v.focus(),B.trapFocus&&t.addEventListener&&(t.addEventListener("focus",s,!0),he.one(le,function(){t.removeEventListener("focus",s,!0)})),B.returnFocus&&he.one(le,function(){e(A).focus()})),w())}function p(){!v&&t.body&&(X=!1,H=e(i),v=o(se).attr({id:Z,class:e.support.opacity===!1?ee+"IE":"",role:"dialog",tabindex:"-1"}).hide(),g=o(se,"Overlay").hide(),L=e([o(se,"LoadingOverlay")[0],o(se,"LoadingGraphic")[0]]),y=o(se,"Wrapper"),x=o(se,"Content").append(S=o(se,"Title"),M=o(se,"Current"),K=e('<button type="button"/>').attr({id:ee+"Previous"}),I=e('<button type="button"/>').attr({id:ee+"Next"}),R=o("button","Slideshow"),L),O=e('<button type="button"/>').attr({id:ee+"Close"}),y.append(o(se).append(o(se,"TopLeft"),b=o(se,"TopCenter"),o(se,"TopRight")),o(se,!1,"clear:left").append(T=o(se,"MiddleLeft"),x,C=o(se,"MiddleRight")),o(se,!1,"clear:left").append(o(se,"BottomLeft"),k=o(se,"BottomCenter"),o(se,"BottomRight"))).find("div div").css({float:"left"}),F=o(se,!1,"position:absolute; width:9999px; visibility:hidden; display:none"),P=I.add(K).add(M).add(R),e(t.body).append(g,v.append(y,F)))}function m(){function i(e){e.which>1||e.shiftKey||e.altKey||e.metaKey||e.ctrlKey||(e.preventDefault(),f(this))}return!!v&&(X||(X=!0,I.click(function(){J.next()}),K.click(function(){J.prev()}),O.click(function(){J.close()}),g.click(function(){B.overlayClose&&J.close()}),e(t).bind("keydown."+ee,function(e){var t=e.keyCode;$&&B.escKey&&27===t&&(e.preventDefault(),J.close()),$&&B.arrowKey&&E[1]&&!e.altKey&&(37===t?(e.preventDefault(),K.click()):39===t&&(e.preventDefault(),I.click()))}),e.isFunction(e.fn.on)?e(t).on("click."+ee,"."+te,i):e("."+te).live("click."+ee,i)),!0)}function w(){var n,r,s,u=J.prep,f=++de;q=!0,U=!1,A=E[j],d(),c(ae),c(oe,B.onLoad),B.h=B.height?l(B.height,"y")-N-_:B.innerHeight&&l(B.innerHeight,"y"),B.w=B.width?l(B.width,"x")-z-D:B.innerWidth&&l(B.innerWidth,"x"),B.mw=B.w,B.mh=B.h,B.maxWidth&&(B.mw=l(B.maxWidth,"x")-z-D,B.mw=B.w&&B.w<B.mw?B.w:B.mw),B.maxHeight&&(B.mh=l(B.maxHeight,"y")-N-_,B.mh=B.h&&B.h<B.mh?B.h:B.mh),n=B.href,Q=setTimeout(function(){L.show()},100),B.inline?(s=o(se).hide().insertBefore(e(n)[0]),he.one(ae,function(){s.replaceWith(W.children())}),u(e(n))):B.iframe?u(" "):B.html?u(B.html):a(B,n)?(n=h(B,n),U=t.createElement("img"),e(U).addClass(ee+"Photo").bind("error",function(){B.title=!1,u(o(se,"Error").html(B.imgError))}).one("load",function(){var t;f===de&&(U.alt=e(A).attr("alt")||e(A).attr("data-alt")||"",B.retinaImage&&i.devicePixelRatio>1&&(U.height=U.height/i.devicePixelRatio,U.width=U.width/i.devicePixelRatio),B.scalePhotos&&(r=function(){U.height-=U.height*t,U.width-=U.width*t},B.mw&&U.width>B.mw&&(t=(U.width-B.mw)/U.width,r()),B.mh&&U.height>B.mh&&(t=(U.height-B.mh)/U.height,r())),B.h&&(U.style.marginTop=Math.max(B.mh-U.height,0)/2+"px"),E[1]&&(B.loop||E[j+1])&&(U.style.cursor="pointer",U.onclick=function(){J.next()}),U.style.width=U.width+"px",U.style.height=U.height+"px",setTimeout(function(){u(U)},1))}),setTimeout(function(){U.src=n},1)):n&&F.load(n,B.data,function(t,i){f===de&&u("error"===i?o(se,"Error").html(B.xhrError):e(this).contents())})}var g,v,y,x,b,T,C,k,E,H,W,F,L,S,M,R,I,K,O,P,B,_,D,N,z,A,j,U,$,q,G,Q,J,V,X,Y={transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.7,preloading:!0,className:!1,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",open:!1,returnFocus:!0,trapFocus:!0,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp)((#|\?).*)?$/i,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0},Z="colorbox",ee="cbox",te=ee+"Element",ie=ee+"_open",oe=ee+"_load",ne=ee+"_complete",re=ee+"_cleanup",le=ee+"_closed",ae=ee+"_purge",he=e("<a/>"),se="div",de=0,ce={};e.colorbox||(e(p),J=e.fn[Z]=e[Z]=function(t,i){var o=this;if(t=t||{},p(),m()){if(e.isFunction(o))o=e("<a/>"),t.open=!0;else if(!o[0])return o;i&&(t.onComplete=i),o.each(function(){e.data(this,Z,e.extend({},e.data(this,Z)||Y,t))}).addClass(te),(e.isFunction(t.open)&&t.open.call(o)||t.open)&&f(o[0])}return o},J.position=function(t,i){function o(){b[0].style.width=k[0].style.width=x[0].style.width=parseInt(v[0].style.width,10)-D+"px",x[0].style.height=T[0].style.height=C[0].style.height=parseInt(v[0].style.height,10)-_+"px"}var r,a,h,s=0,d=0,c=v.offset();if(H.unbind("resize."+ee),v.css({top:-9e4,left:-9e4}),a=H.scrollTop(),h=H.scrollLeft(),B.fixed?(c.top-=a,c.left-=h,v.css({position:"fixed"})):(s=a,d=h,v.css({position:"absolute"})),d+=B.right!==!1?Math.max(H.width()-B.w-z-D-l(B.right,"x"),0):B.left!==!1?l(B.left,"x"):Math.round(Math.max(H.width()-B.w-z-D,0)/2),s+=B.bottom!==!1?Math.max(n()-B.h-N-_-l(B.bottom,"y"),0):B.top!==!1?l(B.top,"y"):Math.round(Math.max(n()-B.h-N-_,0)/2),v.css({top:c.top,left:c.left,visibility:"visible"}),y[0].style.width=y[0].style.height="9999px",r={width:B.w+z+D,height:B.h+N+_,top:s,left:d},t){var u=0;e.each(r,function(e){if(r[e]!==ce[e])return void(u=t)}),t=u}ce=r,t||v.css(r),v.dequeue().animate(r,{duration:t||0,complete:function(){o(),q=!1,y[0].style.width=B.w+z+D+"px",y[0].style.height=B.h+N+_+"px",B.reposition&&setTimeout(function(){H.bind("resize."+ee,J.position)},1),i&&i()},step:o})},J.resize=function(e){var t;$&&(e=e||{},e.width&&(B.w=l(e.width,"x")-z-D),e.innerWidth&&(B.w=l(e.innerWidth,"x")),W.css({width:B.w}),e.height&&(B.h=l(e.height,"y")-N-_),e.innerHeight&&(B.h=l(e.innerHeight,"y")),e.innerHeight||e.height||(t=W.scrollTop(),W.css({height:"auto"}),B.h=W.height()),W.css({height:B.h}),t&&W.scrollTop(t),J.position("none"===B.transition?0:B.speed))},J.prep=function(i){function n(){return B.w=B.w||W.width(),B.w=B.mw&&B.mw<B.w?B.mw:B.w,B.w}function l(){return B.h=B.h||W.height(),B.h=B.mh&&B.mh<B.h?B.mh:B.h,B.h}if($){var s,d="none"===B.transition?0:B.speed;W.empty().remove(),W=o(se,"LoadedContent").append(i),W.hide().appendTo(F.show()).css({width:n(),overflow:B.scrolling?"auto":"hidden"}).css({height:l()}).prependTo(x),F.hide(),e(U).css({float:"none"}),s=function(){function i(){e.support.opacity===!1&&v[0].style.removeAttribute("filter")}var n,l,s=E.length,u="frameBorder",f="allowTransparency";$&&(l=function(){clearTimeout(Q),L.hide(),c(ne,B.onComplete)},S.html(B.title).add(W).show(),s>1?("string"==typeof B.current&&M.html(B.current.replace("{current}",j+1).replace("{total}",s)).show(),I[B.loop||j<s-1?"show":"hide"]().html(B.next),K[B.loop||j?"show":"hide"]().html(B.previous),B.slideshow&&R.show(),B.preloading&&e.each([r(-1),r(1)],function(){var i,o,n=E[this],r=e.data(n,Z);r&&r.href?(i=r.href,e.isFunction(i)&&(i=i.call(n))):i=e(n).attr("href"),i&&a(r,i)&&(i=h(r,i),o=t.createElement("img"),o.src=i)})):P.hide(),B.iframe?(n=o("iframe")[0],u in n&&(n[u]=0),f in n&&(n[f]="true"),B.scrolling||(n.scrolling="no"),e(n).attr({src:B.href,name:(new Date).getTime(),class:ee+"Iframe",allowFullScreen:!0,webkitAllowFullScreen:!0,mozallowfullscreen:!0}).one("load",l).appendTo(W),he.one(ae,function(){n.src="//about:blank"}),B.fastIframe&&e(n).trigger("load")):l(),"fade"===B.transition?v.fadeTo(d,1,i):i())},"fade"===B.transition?v.fadeTo(d,0,function(){J.position(0,s)}):J.position(d,s)}},J.next=function(){!q&&E[1]&&(B.loop||E[j+1])&&(j=r(1),f(E[j]))},J.prev=function(){!q&&E[1]&&(B.loop||j)&&(j=r(-1),f(E[j]))},J.close=function(){$&&!G&&(G=!0,$=!1,c(re,B.onCleanup),H.unbind("."+ee),g.fadeTo(B.fadeOut||0,0),v.stop().fadeTo(B.fadeOut||0,0,function(){v.add(g).css({opacity:1,cursor:"auto"}).hide(),c(ae),W.empty().remove(),setTimeout(function(){G=!1,c(le,B.onClosed)},1)}))},J.hide=function(){g.fadeTo(B.fadeOut||0,0),v.fadeTo(B.fadeOut||0,0,function(){g.hide(),v.css({opacity:1,cursor:"auto",left:"-9999em"}),c(le,B.onClosed)})},J.remove=function(){v&&(v.stop(),e.colorbox.close(),v.stop().remove(),g.remove(),G=!1,v=null,e("."+te).removeData(Z).removeClass(te),e(t).unbind("click."+ee))},J.element=function(){return e(A)},J.settings=Y)}(jQuery,document,window);
+!function(e,t,i){function o(i,o,n){var r=t.createElement(i);return o&&(r.id=X+o),n&&(r.style.cssText=n),e(r)}function n(){return i.innerHeight?i.innerHeight:e(i).height()}function r(e){var t=T.length,i=(N+e)%t;return i<0?t+i:i}function l(e,t){return Math.round((/%/.test(e)?("x"===t?C.width():n())/100:1)*parseInt(e,10))}function a(e,t){return e.photo||e.photoRegex.test(t)}function h(e,t){return e.retinaUrl&&i.devicePixelRatio>1?t.replace(e.photoRegex,e.retinaSuffix):t}function s(e){"contains"in m[0]&&!m[0].contains(e.target)&&(e.stopPropagation(),m.focus())}function d(){var t,i=e.data(D,V);null==i?(K=e.extend({},J),console&&console.log&&console.log("Error: cboxElement missing settings object")):K=e.extend({},i);for(t in K)e.isFunction(K[t])&&"on"!==t.slice(0,2)&&(K[t]=K[t].call(D));K.rel=K.rel||D.rel||e(D).data("rel")||"nofollow",K.href=K.href||e(D).attr("href"),K.title=K.title||D.title,"string"==typeof K.href&&(K.href=e.trim(K.href))}function c(i,o){e(t).trigger(i),re.trigger(i),e.isFunction(o)&&o.call(D)}function u(n){U||(D=n,d(),T=e(D),N=0,"nofollow"!==K.rel&&(T=e("."+Y).filter(function(){var t,i=e.data(this,V);return i&&(t=e(this).data("rel")||i.rel||this.rel),t===K.rel}),-1===(N=T.index(D))&&(T=T.add(D),N=T.length-1)),p.css({opacity:parseFloat(K.opacity),cursor:K.overlayClose?"pointer":"auto",visibility:"visible"}).show(),G&&m.add(p).removeClass(G),K.className&&m.add(p).addClass(K.className),G=K.className,K.closeButton?R.html(K.close).appendTo(g):R.appendTo("<div/>"),A||(A=j=!0,m.css({visibility:"hidden",display:"block"}),k=o(le,"LoadedContent","width:0; height:0; overflow:hidden"),g.css({width:"",height:""}).append(k),O=y.height()+b.height()+g.outerHeight(!0)-g.height(),P=v.width()+x.width()+g.outerWidth(!0)-g.width(),B=k.outerHeight(!0),_=k.outerWidth(!0),K.w=l(K.initialWidth,"x"),K.h=l(K.initialHeight,"y"),q.position(),function(){var e,t,i,o,n,r=X+"Slideshow_",l="click."+X;K.slideshow&&T[1]?(t=function(){clearTimeout(e)},i=function(){(K.loop||T[N+1])&&(e=setTimeout(q.next,K.slideshowSpeed))},o=function(){L.html(K.slideshowStop).unbind(l).one(l,n),re.bind(te,i).bind(ee,t).bind(ie,n),m.removeClass(r+"off").addClass(r+"on")},n=function(){t(),re.unbind(te,i).unbind(ee,t).unbind(ie,n),L.html(K.slideshowStart).unbind(l).one(l,function(){q.next(),o()}),m.removeClass(r+"on").addClass(r+"off")},K.slideshowAuto?o():n()):m.removeClass(r+"off "+r+"on")}(),c(Z,K.onOpen),I.add(W).hide(),m.focus(),K.trapFocus&&t.addEventListener&&(t.addEventListener("focus",s,!0),re.one(oe,function(){t.removeEventListener("focus",s,!0)})),K.returnFocus&&re.one(oe,function(){e(D).focus()})),function(){var n,r,s,u=q.prep,f=++ae;j=!0,z=!1,D=T[N],d(),c(ne),c(ee,K.onLoad),K.h=K.height?l(K.height,"y")-B-O:K.innerHeight&&l(K.innerHeight,"y"),K.w=K.width?l(K.width,"x")-_-P:K.innerWidth&&l(K.innerWidth,"x"),K.mw=K.w,K.mh=K.h,K.maxWidth&&(K.mw=l(K.maxWidth,"x")-_-P,K.mw=K.w&&K.w<K.mw?K.w:K.mw);K.maxHeight&&(K.mh=l(K.maxHeight,"y")-B-O,K.mh=K.h&&K.h<K.mh?K.h:K.mh);n=K.href,$=setTimeout(function(){H.show()},100),K.inline?(s=o(le).hide().insertBefore(e(n)[0]),re.one(ne,function(){s.replaceWith(k.children())}),u(e(n))):K.iframe?u(" "):K.html?u(K.html):a(K,n)?(n=h(K,n),z=t.createElement("img"),e(z).addClass(X+"Photo").bind("error",function(){K.title=!1,u(o(le,"Error").html(K.imgError))}).one("load",function(){var t;f===ae&&(z.alt=e(D).attr("alt")||e(D).attr("data-alt")||"",K.retinaImage&&i.devicePixelRatio>1&&(z.height=z.height/i.devicePixelRatio,z.width=z.width/i.devicePixelRatio),K.scalePhotos&&(r=function(){z.height-=z.height*t,z.width-=z.width*t},K.mw&&z.width>K.mw&&(t=(z.width-K.mw)/z.width,r()),K.mh&&z.height>K.mh&&(t=(z.height-K.mh)/z.height,r())),K.h&&(z.style.marginTop=Math.max(K.mh-z.height,0)/2+"px"),T[1]&&(K.loop||T[N+1])&&(z.style.cursor="pointer",z.onclick=function(){q.next()}),z.style.width=z.width+"px",z.style.height=z.height+"px",setTimeout(function(){u(z)},1))}),setTimeout(function(){z.src=n},1)):n&&E.load(n,K.data,function(t,i){f===ae&&u("error"===i?o(le,"Error").html(K.xhrError):e(this).contents())})}())}function f(){!m&&t.body&&(Q=!1,C=e(i),m=o(le).attr({id:V,class:!1===e.support.opacity?X+"IE":"",role:"dialog",tabindex:"-1"}).hide(),p=o(le,"Overlay").hide(),H=e([o(le,"LoadingOverlay")[0],o(le,"LoadingGraphic")[0]]),w=o(le,"Wrapper"),g=o(le,"Content").append(W=o(le,"Title"),F=o(le,"Current"),M=e('<button type="button"/>').attr({id:X+"Previous"}),S=e('<button type="button"/>').attr({id:X+"Next"}),L=o("button","Slideshow"),H),R=e('<button type="button"/>').attr({id:X+"Close"}),w.append(o(le).append(o(le,"TopLeft"),y=o(le,"TopCenter"),o(le,"TopRight")),o(le,!1,"clear:left").append(v=o(le,"MiddleLeft"),g,x=o(le,"MiddleRight")),o(le,!1,"clear:left").append(o(le,"BottomLeft"),b=o(le,"BottomCenter"),o(le,"BottomRight"))).find("div div").css({float:"left"}),E=o(le,!1,"position:absolute; width:9999px; visibility:hidden; display:none"),I=S.add(M).add(F).add(L),e(t.body).append(p,m.append(w,E)))}var p,m,w,g,y,v,x,b,T,C,k,E,H,W,F,L,S,M,R,I,K,O,P,B,_,D,N,z,A,j,U,$,q,G,Q,J={transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.7,preloading:!0,className:!1,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",open:!1,returnFocus:!0,trapFocus:!0,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp)((#|\?).*)?$/i,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0},V="colorbox",X="cbox",Y=X+"Element",Z=X+"_open",ee=X+"_load",te=X+"_complete",ie=X+"_cleanup",oe=X+"_closed",ne=X+"_purge",re=e("<a/>"),le="div",ae=0,he={};e.colorbox||(e(f),(q=e.fn[V]=e[V]=function(i,o){var n=this;if(i=i||{},f(),function(){function i(e){e.which>1||e.shiftKey||e.altKey||e.metaKey||e.ctrlKey||(e.preventDefault(),u(this))}return!!m&&(Q||(Q=!0,S.click(function(){q.next()}),M.click(function(){q.prev()}),R.click(function(){q.close()}),p.click(function(){K.overlayClose&&q.close()}),e(t).bind("keydown."+X,function(e){var t=e.keyCode;A&&K.escKey&&27===t&&(e.preventDefault(),q.close()),A&&K.arrowKey&&T[1]&&!e.altKey&&(37===t?(e.preventDefault(),M.click()):39===t&&(e.preventDefault(),S.click()))}),e.isFunction(e.fn.on)?e(t).on("click."+X,"."+Y,i):e("."+Y).live("click."+X,i)),!0)}()){if(e.isFunction(n))n=e("<a/>"),i.open=!0;else if(!n[0])return n;o&&(i.onComplete=o),n.each(function(){e.data(this,V,e.extend({},e.data(this,V)||J,i))}).addClass(Y),(e.isFunction(i.open)&&i.open.call(n)||i.open)&&u(n[0])}return n}).position=function(t,i){function o(){y[0].style.width=b[0].style.width=g[0].style.width=parseInt(m[0].style.width,10)-P+"px",g[0].style.height=v[0].style.height=x[0].style.height=parseInt(m[0].style.height,10)-O+"px"}var r,a,h,s=0,d=0,c=m.offset();if(C.unbind("resize."+X),m.css({top:-9e4,left:-9e4}),a=C.scrollTop(),h=C.scrollLeft(),K.fixed?(c.top-=a,c.left-=h,m.css({position:"fixed"})):(s=a,d=h,m.css({position:"absolute"})),!1!==K.right?d+=Math.max(C.width()-K.w-_-P-l(K.right,"x"),0):!1!==K.left?d+=l(K.left,"x"):d+=Math.round(Math.max(C.width()-K.w-_-P,0)/2),!1!==K.bottom?s+=Math.max(n()-K.h-B-O-l(K.bottom,"y"),0):!1!==K.top?s+=l(K.top,"y"):s+=Math.round(Math.max(n()-K.h-B-O,0)/2),m.css({top:c.top,left:c.left,visibility:"visible"}),w[0].style.width=w[0].style.height="9999px",r={width:K.w+_+P,height:K.h+B+O,top:s,left:d},t){var u=0;e.each(r,function(e){r[e]===he[e]||(u=t)}),t=u}he=r,t||m.css(r),m.dequeue().animate(r,{duration:t||0,complete:function(){o(),j=!1,w[0].style.width=K.w+_+P+"px",w[0].style.height=K.h+B+O+"px",K.reposition&&setTimeout(function(){C.bind("resize."+X,q.position)},1),i&&i()},step:o})},q.resize=function(e){var t;A&&((e=e||{}).width&&(K.w=l(e.width,"x")-_-P),e.innerWidth&&(K.w=l(e.innerWidth,"x")),k.css({width:K.w}),e.height&&(K.h=l(e.height,"y")-B-O),e.innerHeight&&(K.h=l(e.innerHeight,"y")),e.innerHeight||e.height||(t=k.scrollTop(),k.css({height:"auto"}),K.h=k.height()),k.css({height:K.h}),t&&k.scrollTop(t),q.position("none"===K.transition?0:K.speed))},q.prep=function(i){if(A){var n,l="none"===K.transition?0:K.speed;k.empty().remove(),(k=o(le,"LoadedContent").append(i)).hide().appendTo(E.show()).css({width:(K.w=K.w||k.width(),K.w=K.mw&&K.mw<K.w?K.mw:K.w,K.w),overflow:K.scrolling?"auto":"hidden"}).css({height:(K.h=K.h||k.height(),K.h=K.mh&&K.mh<K.h?K.mh:K.h,K.h)}).prependTo(g),E.hide(),e(z).css({float:"none"}),n=function(){function i(){!1===e.support.opacity&&m[0].style.removeAttribute("filter")}var n,s,d=T.length,u="allowTransparency";A&&(s=function(){clearTimeout($),H.hide(),c(te,K.onComplete)},W.html(K.title).add(k).show(),d>1?("string"==typeof K.current&&F.html(K.current.replace("{current}",N+1).replace("{total}",d)).show(),S[K.loop||N<d-1?"show":"hide"]().html(K.next),M[K.loop||N?"show":"hide"]().html(K.previous),K.slideshow&&L.show(),K.preloading&&e.each([r(-1),r(1)],function(){var i,o=T[this],n=e.data(o,V);n&&n.href?(i=n.href,e.isFunction(i)&&(i=i.call(o))):i=e(o).attr("href"),i&&a(n,i)&&(i=h(n,i),t.createElement("img").src=i)})):I.hide(),K.iframe?("frameBorder"in(n=o("iframe")[0])&&(n.frameBorder=0),u in n&&(n[u]="true"),K.scrolling||(n.scrolling="no"),e(n).attr({src:K.href,name:(new Date).getTime(),class:X+"Iframe",allowFullScreen:!0,webkitAllowFullScreen:!0,mozallowfullscreen:!0}).one("load",s).appendTo(k),re.one(ne,function(){n.src="//about:blank"}),K.fastIframe&&e(n).trigger("load")):s(),"fade"===K.transition?m.fadeTo(l,1,i):i())},"fade"===K.transition?m.fadeTo(l,0,function(){q.position(0,n)}):q.position(l,n)}},q.next=function(){!j&&T[1]&&(K.loop||T[N+1])&&(N=r(1),u(T[N]))},q.prev=function(){!j&&T[1]&&(K.loop||N)&&(N=r(-1),u(T[N]))},q.close=function(){A&&!U&&(U=!0,A=!1,c(ie,K.onCleanup),C.unbind("."+X),p.fadeTo(K.fadeOut||0,0),m.stop().fadeTo(K.fadeOut||0,0,function(){m.add(p).css({opacity:1,cursor:"auto"}).hide(),c(ne),k.empty().remove(),setTimeout(function(){U=!1,c(oe,K.onClosed)},1)}))},q.hide=function(){p.fadeTo(K.fadeOut||0,0),m.fadeTo(K.fadeOut||0,0,function(){p.hide(),m.css({opacity:1,cursor:"auto",left:"-9999em"}),c(oe,K.onClosed)})},q.remove=function(){m&&(m.stop(),e.colorbox.close(),m.stop().remove(),p.remove(),U=!1,m=null,e("."+Y).removeData(V).removeClass(Y),e(t).unbind("click."+X))},q.element=function(){return e(D)},q.settings=J)}(jQuery,document,window);

shopp/trunk/core/ui/behaviors/editors.js

@@ -707 +707 @@
 }
 
-/**
- * Image Uploads using SWFUpload or the jQuery plugin One Click Upload
- **/
-function ImageUploads (id,type) {
-    var $ = jQuery,
-    swfu,
-    settings = {
-        button_text: ADD_IMAGE_BUTTON_TEXT,
-        button_text_style: '.buttonText{text-align:center;font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,_sans;font-size:9px;color:#333333;}',
-        button_text_top_padding: 3,
-        button_height: "18",
-        button_width: "100",
-        button_image_url: uidir+'/icons/buttons.png',
-        button_placeholder_id: "swf-uploader-button",
-        upload_url : ajaxurl,
-        flash_url : uidir+'/behaviors/swfupload.swf',
-        file_queue_limit : 0,
-        file_size_limit : filesizeLimit+'b',
-        file_types : "*.jpg;*.jpeg;*.png;*.gif",
-        file_types_description : "Web-compatible Image Files",
-        file_upload_limit : filesizeLimit,
-        post_params : {
-            action:'shopp_upload_image',
-            parent:id,
-            type:type
-        },
-
-        swfupload_loaded_handler : swfuLoaded,
-        file_queue_error_handler : imageFileQueueError,
-        file_dialog_complete_handler : imageFileDialogComplete,
-        upload_start_handler : startImageUpload,
-        upload_progress_handler : imageUploadProgress,
-        upload_error_handler : imageUploadError,
-        upload_success_handler : imageUploadSuccess,
-
-        custom_settings : {
-            loaded: false,
-            targetHolder : false,
-            progressBar : false,
-            sorting : false
-
-        },
-        prevent_swf_caching: $.ua.msie, // Prevents Flash caching issues in IE
-        debug: imageupload_debug
-
-    };
-
-    // Initialize image uploader
-    if (flashuploader)
-        swfu = new SWFUpload(settings);
-
-    // Browser image uploader
-    $('#image-upload').upload({
-        name: 'Filedata',
-        action: ajaxurl,
-        params: {
-            action:'shopp_upload_image',
-            type:type
-        },
-        onSubmit: function() {
-            this.targetHolder = $('<li id="image-uploading"><input type="hidden" name="images[]" value="" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo('#lightbox');
-            this.progressBar = this.targetHolder.find('div.bar');
-            this.sorting = this.targetHolder.find('input');
-        },
-        onComplete: function(results) {
-            var image = false,img,deleteButton,targetHolder = this.targetHolder;
-
-            try {
-                image = $.parseJSON(results);
-            } catch (ex) {
-                image.error = results;
-            }
-
-            if (!image || !image.id) {
-                targetHolder.remove();
-                if (image.error) alert(image.error);
-                else alert(UNKNOWN_UPLOAD_ERROR);
-                return false;
-            }
-
-            targetHolder.attr({'id':'image-'+image.id});
-            this.sorting.val(image.id);
-            img = $('<img src="?siid='+image.id+'" width="96" height="96" class="handle" />').appendTo(targetHolder).hide();
-            deleteButton = $('<button type="button" name="deleteImage" value="'+image.src+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo($(targetHolder)).hide();
-
-            $(this.progressBar).animate({'width':'76px'},250,function () {
-                $(this).parent().fadeOut(500,function() {
-                    $(this).remove();
-                    $(img).fadeIn('500');
-                    enableDeleteButton(deleteButton);
+function ImageUploads(parent, type) {
+    var $ = jQuery;
+    Dropzone.autoDiscover = false;
+
+    $.template('image-preview-template', $('#lightbox-image-template'));
+
+    var myDropzone = new Dropzone('ul.lightbox-dropzone', {
+        url: imgul_url + "&type=" + type + '&parent=' + parent,
+        maxFilesize: uploadLimit / 1024 / 1024,
+        autoDiscover: false,
+        parallelUploads: 5,
+        autoProcessQueue: true,
+        previewTemplate: $.tmpl('image-preview-template').html(),
+        acceptedFiles: "image/*",
+        init: function () {
+            var self = this;
+            $('.image-upload').on('click', function () {
+                self.hiddenFileInput.click();
+            });
+
+            self.on('error', function(file, message) {
+                $('.lightbox-dropzone li.dz-error').on('click', function () {
+                    $(this).fadeOut(300, function () {
+                        $(this).remove();
+                    });
                 });
             });
+
+            self.on('success', function (file, response) {
+                $(file.previewElement).find('.imageid').attr('value', response.id);
+            });
+
+            self.on('complete', function (file, response) {
+                sorting();
+            });
         }
     });
 
-    $(document).load(function() {
-        if (!swfu.loaded) $('#product-images .swfupload').remove();
-    });
-
     sorting();
-    $('#lightbox li').each(function () {
+    $('.lightbox-dropzone li:not(.dz-upload-control)').each(function () {
         $(this).dblclick(function () {
             var id = $(this).attr('id')+"-details",
@@ -879 +818 @@
     });
 
-    function swfuLoaded () {
-        $('#browser-uploader').hide();
-        swfu.loaded = true;
-    }
-
     function sorting () {
-        if ($('#lightbox li').size() > 0) $('#lightbox').sortable({'opacity':0.8});
-    }
-
-    function imageFileQueueError (file, error, message) {
-
-        if (error == SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED) {
-            alert("You selected too many files to upload at one time. " + (message === 0 ? "You have reached the upload limit." : "You may upload " + (message > 1 ? "up to " + message + " files." : "only one file.")));
-            return;
-        } else alert(message);
-
-    }
-
-    function imageFileDialogComplete (selected, queued) {
-        try {
-            this.startUpload();
-        } catch (ex) {
-            this.debug(ex);
-        }
-    }
-
-    function startImageUpload (file) {
-        this.targetHolder = $('<li class="image uploading"><input type="hidden" name="images[]" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo($('#lightbox'));
-        this.progressBar = this.targetHolder.find('div.bar');
-        this.sorting = this.targetHolder.find('input');
-    }
-
-    function imageUploadProgress (file, loaded, total) {
-        this.progressBar.animate({'width':Math.ceil((loaded/total)*76)+'px'},100);
-    }
-
-    function imageUploadError (file, error, message) {
-        //debuglog(error+": "+message);
-    }
-
-    function imageUploadSuccess (file, results) {
-        var image = false,img,deleteButton,targetHolder = this.targetHolder;
-        try {
-            image = $.parseJSON(results);
-        } catch (ex) {
-            targetHolder.remove();
-            alert(results);
-            return false;
-        }
-
-        if (!image.id) {
-            targetHolder.remove();
-            if (image.error) alert(image.error);
-            else alert(UNKNOWN_UPLOAD_ERROR);
-            return true;
-        }
-
-        targetHolder.attr({'id':'image-'+image.id});
-        this.sorting.val(image.id);
-        img = $('<img src="?siid='+image.id+'" width="96" height="96" class="handle" />').appendTo(targetHolder).hide();
-        deleteButton = $('<button type="button" name="deleteImage" value="'+image.id+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo(targetHolder).hide();
-        sorting();
-
-        this.progressBar.animate({'width':'76px'},250,function () {
-            $(this).parent().fadeOut(500,function() {
-                $(this).remove();
-                $(img).fadeIn('500');
-                enableDeleteButton(deleteButton);
-            });
-        });
+        if ($('.lightbox-dropzone li').length > 0)
+            $('.lightbox-dropzone').sortable({'opacity':0.8});
     }
 
@@ -973 +845 @@
         });
     }
-
 }
 
@@ -979 +850 @@
     var $ = jQuery,
         _ = this,
-        chooser = $('#chooser'),
-        importurl = chooser.find('.fileimport'),
-        importstatus = chooser.find('.status'),
-        attach = $('#attach-file'),
-        dlpath = $('#download_path-'+line),
-        dlname = $('#download_file-'+line),
+        uiChooser = $('#filechooser'),
+        uiImportURL = uiChooser.find('.fileimport'),
+        uiImportStatus = uiChooser.find('.status'),
+        uiAttachFile = $('#attach-file'),
+        uiDownloadPath = $('#download_path-'+line),
+        uiDownloadFilename = $('#download_file-'+line),
         file = $('#file-'+line),
-        stored = false,
-        nostatus = 0,
-        progressbar = false;
+        stored = false;
 
     _.line = line;
     _.status = status;
 
-    chooser.unbind('change').on('change', '.fileimport', function (e) {
-        importstatus.attr('class','status').addClass('shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8');
+    uiChooser.unbind('change').on('change', '.fileimport', function (e) {
+        uiImportStatus.attr('class','status').addClass('shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8');
         $.ajax({url:fileverify_url+'&action=shopp_verify_file&t=download',
                 type:"POST",
-                data:'url='+importurl.val(),
+                data:'url='+uiImportURL.val(),
                 timeout:10000,
                 dataType:'text',
                 success:function (results) {
-                    importstatus.attr('class','status');
-                    if (results == "OK") return importstatus.addClass('shoppui-ok-sign');
-                    if (results == "NULL") importstatus.attr('title',FILE_NOT_FOUND_TEXT);
-                    if (results == "ISDIR") importstatus.attr('title',FILE_ISDIR_TEXT);
-                    if (results == "READ") importstatus.attr('title',FILE_NOT_READ_TEXT);
-                    importstatus.addClass("shoppui-warning-sign");
+                    uiImportStatus.attr('class','status');
+                    if (results == "OK") return uiImportStatus.addClass('shoppui-ok-sign');
+                    if (results == "NULL") uiImportStatus.attr('title',FILE_NOT_FOUND_TEXT);
+                    if (results == "ISDIR") uiImportStatus.attr('title',FILE_ISDIR_TEXT);
+                    if (results == "READ") uiImportStatus.attr('title',FILE_NOT_READ_TEXT);
+                    uiImportStatus.addClass("shoppui-warning-sign");
                 }
         });
     });
 
-    importurl.unbind('keydown').unbind('keypress').suggest(
-        sugg_url+'&action=shopp_storage_suggestions&t=download',
-        { delay:500, minchars:3, multiple:false, onSelect:function () { importurl.trigger('change'); } }
+    uiImportURL.unbind('keydown').unbind('keypress').suggest(
+        sugg_url + '&action=shopp_storage_suggestions&t=download', {
+            delay: 500,
+            minchars: 3,
+            multiple:false,
+            onSelect:function () {
+                uiImportURL.trigger('change');
+            }
+        }
     );
 
     $(this).click(function () {
-        fileUploads.updateLine(line,status);
-        importstatus.attr('class','status');
-
-        attach.unbind('click').click(function () {
+        uiImportStatus.attr('class','status');
+
+        fileUploads.dropzone.previewsContainer = file[0];
+        fileUploads.priceline = _.line;
+
+        // File import handling
+        uiAttachFile.unbind('click').click(function () {
             $.colorbox.hide();
+
             if (stored) {
-                dlpath.val(importurl.val());
-                importurl.val('').attr('class','fileimport');
+                uiDownloadPath.val(uiImportURL.val());
+                uiImportURL.val('').attr('class','fileimport');
                 return true;
             }
 
-            var importid = false,
-                importdata = false,
-                importfile = importurl.val(),
-
-                completed = function (f) {
-                    if (!f.name) return $this.attr('class','');
-                    file.attr('class','file').html('<span class="icon shoppui-file '+f.mime.replace('/',' ')+'"></span>'+f.name+'<br /><small>'+readableFileSize(f.size)+'</small>');
-                    dlpath.val(f.path); dlname.val(f.name);
-                    importurl.val('').attr('class','fileimport');
+            var importId = false,
+                uiSetup = false,
+                noProgressTimeout = 0,
+                importFile = uiImportURL.val(),
+
+                completed = function (filedata) {
+                    if ( ! filedata.name )
+                        return $this.attr('class', '');
+                    uiDownloadPath.val(filedata.path);
+                    uiDownloadFilename.val(filedata.name);
+                    uiImportURL.val('').attr('class', 'fileimport');
                 },
 
-                importing = function () {
-                    var ui = file.find('div.progress'),
-                        progressbar = ui.find('div.bar'),
-                        scale = ui.outerWidth(),
-                        dataframe = $('#import-file-'+line).get(0).contentWindow,
-                        p = dataframe['importProgress'],
-                        f = dataframe['importFile'];
-
-                    if (f !== undefined) {
-                        if (f.error) return file.attr('class','error').html('<small>'+f.error+'</small>');
-                        if (!f.path) return file.attr('class','error').html('<small>'+FILE_UNKNOWN_IMPORT_ERROR+'</small>');
-
-                        if (f.stored) {
-                            return completed(f);
+                error = function (message) {
+                    if ( ! message ) message = FILE_UNKNOWN_IMPORT_ERROR;
+                    file.attr('class', 'error').html('<small>' + message + '</small>');
+                },
+
+                process = function () {
+                    var progress = dataFrame.importProgress,
+                        filedata = dataFrame.importFile;
+
+                    if ( filedata === undefined )
+                        return waitForUploadProgress();
+
+                    // Handle errors
+                    if ( ! filedata.path )
+                        return error();
+                    if ( filedata.error )
+                        return error(filedata.error);
+
+                    // Allow a passthrough on already imported, stored files
+                    if ( filedata.stored )
+                        return completed(filedata);
+
+                    if ( progress === undefined )
+                        progress = 0;
+
+                    savepath = filedata.path.split('/');
+                    importId = savepath[ savepath.length - 1 ];
+
+                    // Initialize the UI with file data
+                    if ( ! uiSetup ) {
+                        uiIcon.addClass(filedata.mime.replace('/',' '));
+                        uiFilename.text(filedata.name);
+                        uiFilesize.text(readableFileSize(filedata.size));
+                        uiProgressBar.css('opacity',1);
+                        uiSetup = true;
+                    }
+
+                    if ( progress === 0 && noProgressTimeout++ > 60)
+                        return error();
+
+                    var uploadProgress = Math.floor(progress * 100);
+
+                    uiUploadProgress[0].style.width = uploadProgress + "%";
+
+                    if ( uploadProgress >= 100 )
+                        uiProgressBar.fadeOut(500, function() {
+                            completed(filedata);
+                        });
+                    else waitForUploadProgress();
+
+                },
+
+                waitForUploadProgress = function () {
+                    setTimeout(process, 100);
+                };
+
+            $.template('filechooser-upload-template', $('#filechooser-upload-template'));
+
+            file.attr('class','').html($.tmpl('filechooser-upload-template').html()).append('<iframe id="import-file-'+line+'" width="0" height="0" src="'+fileimport_url+'&action=shopp_import_file&url='+importFile+'"></iframe>');
+
+            var dataFrame = $('#import-file-'+line)[0].contentWindow,
+                uiIcon = file.find('.icon'),
+                uiFilename = file.find('.dz-filename'),
+                uiFilesize = file.find('.dz-size'),
+                uiProgressBar = file.find('.dz-progress'),
+                uiUploadProgress = file.find('.dz-upload');
+
+            waitForUploadProgress();
+
+        }); // uiAttachFile click handler
+
+    }); // file chooser click handler
+
+    $(this).colorbox({'title':'File Selector','innerWidth':'360','innerHeight':'140','inline':true,'href':uiChooser});
+};
+
+function FileUploader(container) {
+    var $ = jQuery,
+        _ = this;
+
+    this.priceline = false;
+
+    $.template('filechooser-upload-template', $('#filechooser-upload-template'));
+
+    this.dropzone = new Dropzone(container, {
+        url: fileupload_url,
+        autoDiscover: false,
+        uploadMultiple: false,
+        autoQueue: true,
+        autoProcessQueue: true,
+        chunking: true,
+        forceChunking: true,
+        chunkSize: chunkSize,
+        maxFilesize: 4096,
+        parallelChunkUploads: false,
+        retryChunks: true,
+        parallelConnectionsLimit: uploadMaxConnections,
+        previewTemplate: $.tmpl('filechooser-upload-template').html(),
+        init: function () {
+            var self = this;
+            self.startTime = false;
+            self.samples = [];
+            self.samplesLimit = 5;
+            self.connections = 0;
+
+            $('.filechooser-upload').on('mousedown', function () {
+                self.hiddenFileInput.click();
+                $(self.previewsContainer).empty();
+            });
+
+            self.on('addedfile', function (file) {
+                $.colorbox.hide();
+                self.processQueue();
+                $(self.previewsContainer).find('.icon.shoppui-file').addClass(file.type.replace('/',' '));
+            });
+
+            self.on('success', function (file) {
+                var response = JSON.parse(file.xhr.response);
+                if ( response.id )
+                    $('<input>').attr({
+                        type: 'hidden',
+                        name: 'price[' + _.priceline + '][download]',
+                        value: response.id
+                    }).appendTo($(self.previewsContainer));
+            });
+
+            self.options.params = function (files, xhr, chunk) {
+                if (chunk) {
+                    return {
+                        dzuuid: chunk.file.upload.uuid,
+                        dzchunkindex: chunk.index,
+                        dztotalfilesize: chunk.file.size,
+                        dzchunksize: chunk.chunkSize,
+                        dztotalchunkcount: chunk.file.upload.totalChunkCount,
+                        dzchunkbyteoffset: chunk.end
+                    };
+                }
+            };
+
+            self.uploadFiles = function (files) {
+                var _this15 = this;
+
+                this._transformFiles(files, function (transformedFiles) {
+                    if (files[0].upload.chunked) {
+                        // This file should be sent in chunks!
+
+                        // If the chunking option is set, we **know** that there can only be **one** file, since
+                        // uploadMultiple is not allowed with this option.
+                        var file = files[0];
+                        var transformedFile = transformedFiles[0];
+                        var startedChunkCount = 0;
+
+                        file.upload.chunks = [];
+
+                        var handleNextChunk = function handleNextChunk() {
+                            var chunkIndex = 0;
+
+                            // Find the next item in file.upload.chunks that is not defined yet.
+                            while (file.upload.chunks[chunkIndex] !== undefined) {
+                                chunkIndex++;
+                            }
+
+                            // This means, that all chunks have already been started.
+                            if (chunkIndex >= file.upload.totalChunkCount) return;
+
+                            startedChunkCount++;
+
+                            var start = chunkIndex * _this15.options.chunkSize;
+                            var end = Math.min(start + _this15.options.chunkSize, file.size);
+
+                            /** Added for dynamic bandwidth **/
+                            if ( self.startTime === false )
+                                self.startTime = (new Date()).getTime();
+
+                            var nowTime = (new Date()).getTime();
+
+                            if (self.samples.length <= self.samplesLimit && file.upload.bytesSent > 0) {
+                                self.samples.push(file.upload.bytesSent / ( (nowTime - self.startTime) / 1000 ));
+                            }
+
+                            if ( self.samples.length == self.samplesLimit ) {
+                                var sum = self.samples.reduce(function(a, b) { return a + b; });
+                                var avgSpeed = sum / self.samples.length;
+
+                                self.options.chunkSize = Math.min(Math.floor(avgSpeed), uploadLimit - 1024);
+                                file.upload.totalChunkCount = Math.ceil((file.size - file.upload.bytesSent) / self.options.chunkSize) + self.samplesLimit;
+
+                                // Determine if there is spare bandwidth for parallel chunk uploads and set limits
+                                var parallelConnectionsLimit = Math.floor(avgSpeed / self.options.chunkSize);
+                                if ( parallelConnectionsLimit > 1 ) {
+                                    self.options.parallelChunkUploads = true;
+                                    self.options.parallelConnectionsLimit = Math.min(parallelConnectionsLimit, self.options.parallelConnectionsLimit);
+                                }
+
+                            }
+
+                            if ( chunkIndex > 0 ) {
+                                start = file.upload.chunks[chunkIndex - 1].end;
+                                end = Math.min(start + self.options.chunkSize, file.size);
+                            }
+                            /** End dynamic bandwidth handler **/
+
+                            var dataBlock = {
+                                name: _this15._getParamName(0),
+                                data: transformedFile.webkitSlice ? transformedFile.webkitSlice(start, end) : transformedFile.slice(start, end),
+                                filename: file.upload.filename,
+                                chunkIndex: chunkIndex
+                            };
+
+                            file.upload.chunks[chunkIndex] = {
+                                file: file,
+                                index: chunkIndex,
+                                dataBlock: dataBlock, // In case we want to retry.
+                                status: Dropzone.UPLOADING,
+                                progress: 0,
+                                start: start, // Added for dynamic bandiwdth handling
+                                end: end, // Added for dynamic bandiwdth handling
+                                chunkSize: self.options.chunkSize, // Added for dynamic bandiwdth handling
+                                retries: 0 // The number of times this block has been retried.
+                            };
+
+                            _this15._uploadData(files, [dataBlock]);
+                        };
+
+                        var parallelChunkUpload = function() {
+                            if ( self.connections > 0 )
+                                self.connections--; // Finished an upload
+
+                            for ( ; self.connections < self.options.parallelConnectionsLimit; self.connections++ )
+                                handleNextChunk();
+                        };
+
+                        file.upload.finishedChunkUpload = function (chunk) {
+                            var allFinished = true;
+                            chunk.status = Dropzone.SUCCESS;
+
+                            // Clear the data from the chunk
+                            chunk.dataBlock = null;
+
+                            for (var i = 0; i < file.upload.totalChunkCount; i++) {
+                                if (file.upload.chunks[i] === undefined) {
+                                    // Handle parallel chunk upload connections
+                                    if ( self.options.parallelChunkUploads ) {
+                                        return parallelChunkUpload();
+                                    } else {
+                                        return handleNextChunk();
+                                    }
+                                }
+                                if (file.upload.chunks[i].status !== Dropzone.SUCCESS) {
+                                    allFinished = false;
+                                }
+                            }
+
+                            if (allFinished) {
+                                _this15.options.chunksUploaded(file, function () {
+                                    _this15._finished(files, '', null);
+                                });
+                            }
+                        };
+
+                        if (_this15.options.parallelChunkUploads) {
+                            for (var i = 0; i < file.upload.totalChunkCount; i++) {
+                                handleNextChunk();
+                            }
                         } else {
-                            savepath = f.path.split('/');
-                            importid = savepath[savepath.length-1];
+                            handleNextChunk();
                         }
+                    } else {
+                        var dataBlocks = [];
+                        for (var _i22 = 0; _i22 < files.length; _i22++) {
+                            dataBlocks[_i22] = {
+                                name: _this15._getParamName(_i22),
+                                data: transformedFiles[_i22],
+                                filename: files[_i22].upload.filename
+                            };
+                        }
+                        _this15._uploadData(files, dataBlocks);
                     }
-
-                    if (!p) p = 0;
-
-                    // No status timeout failure
-                    if (p === 0 && nostatus++ > 60) return file.attr('class','error').html('<small>'+FILE_UNKNOWN_IMPORT_ERROR+'</small>');
-
-                    progressbar.animate({'width': Math.ceil(p*scale) +'px'},100);
-                    if (p == 1) { // Completed
-                        if (progressbar) progressbar.css({'width':'100%'}).fadeOut(500,function () { completed(f); });
-                        return;
-                    }
-                    setTimeout(importing,100);
-                };
-
-            setTimeout(importing,100);
-            file.attr('class','').html(
-                '<div class="progress"><div class="bar"></div><div class="gloss"></div></div>'+
-                '<iframe id="import-file-'+line+'" width="0" height="0" src="'+fileimport_url+'&action=shopp_import_file&url='+importfile+'"></iframe>'
-            );
-        });
-
-    });
-
-    $(this).colorbox({'title':'File Selector','innerWidth':'360','innerHeight':'140','inline':true,'href':chooser});
-};
-
-
-/**
- * File upload handlers for product download files using SWFupload
- **/
-function FileUploader (button, defaultButton) {
-    var $ = jQuery, _ = this;
-
-    _.swfu = false;
-    _.settings = {
-        button_text: UPLOAD_FILE_BUTTON_TEXT,
-        button_text_style: '.buttonText{text-align:center;font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,_sans;font-size:9px;color:#333333; }',
-        button_text_top_padding: 3,
-        button_height: "22",
-        button_width: "100",
-        button_image_url: uidir+'/icons/buttons.png',
-        button_placeholder_id: button,
-        button_action: SWFUpload.BUTTON_ACTION.SELECT_FILE,
-        flash_url : uidir+'/behaviors/swfupload.swf',
-        upload_url : ajaxurl,
-        file_queue_limit : 1,
-        file_size_limit : filesizeLimit+'b',
-        file_types : "*.*",
-        file_types_description : "All Files",
-        file_upload_limit : filesizeLimit,
-        post_params : {
-            action:'shopp_upload_file'
-        },
-
-        swfupload_loaded_handler : swfuLoaded,
-        file_queue_error_handler : fileQueueError,
-        file_dialog_complete_handler : fileDialogComplete,
-        upload_start_handler : startUpload,
-        upload_progress_handler : uploadProgress,
-        upload_success_handler : uploadSuccess,
-
-        custom_settings : {
-            loaded : false,
-            targetCell : false,
-            targetLine : false,
-            progressBar : false
-        },
-        prevent_swf_caching: $.ua.msie, // Prevents Flash caching issues in IE
-        debug: fileupload_debug 
-
-    };
-
-    // Initialize file uploader
-
-    if (flashuploader)
-        _.swfu = new SWFUpload(_.settings);
-
-    // Browser-based AJAX uploads
-    defaultButton.upload({
-        name: 'Filedata',
-        action: ajaxurl,
-        params: { action:'shopp_upload_file' },
-        onSubmit: function() {
-            $.colorbox.hide();
-            _.targetCell.attr('class','').html('');
-            $('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(_.targetCell);
-            _.progressBar = _.targetCell.find('div.bar');
-        },
-        onComplete: function(results) {
-            $.colorbox.close();
-
-            var filedata = false,targetHolder = _.targetCell;
-            try {
-                filedata = $.parseJSON(results);
-            } catch (ex) {
-                filedata.error = results;
+                });
             }
 
-            if (!filedata.id && !filedata.name) {
-                targetHolder.html(NO_DOWNLOAD);
-                if (filedata.error) alert(filedata.error);
-                else alert(UNKNOWN_UPLOAD_ERROR);
-                return false;
-            }
-            filedata.type = filedata.type.replace(/\//gi," ");
-            $(_.progressBar).animate({'width':'76px'},250,function () {
-                $(this).parent().fadeOut(500,function() {
-                    targetHolder.attr('class', 'file').html(
-                        '<div class="icon shoppui-file ' + filedata.type + '"></div>' +
-                        filedata.name + '<br /><small>' + readableFileSize(filedata.size)+'</small>' +
-                        '<input type="hidden" name="price[' + _.targetLine + '][download]" value="' + filedata.id + '" />'
-                    );
-                    $(this).remove();
-                });
-            });
-        }
-    });
-
-    $(_).load(function () {
-        if (!_.swfu || !_.swfu.loaded) $(defaultButton).parent().parent().find('.swfupload').remove();
-    });
-
-    function swfuLoaded () {
-        $(defaultButton).hide();
-        this.loaded = true;
-    }
-
-    _.updateLine = function (line,status) {
-        if (!_.swfu) {
-            _.targetLine = line;
-            _.targetCell = status;
-        } else {
-            _.swfu.targetLine = line;
-            _.swfu.targetCell = status;
-        }
-    };
-
-    function fileQueueError (file, error, message) {
-        if (error == SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED) {
-            alert("You selected too many files to upload at one time. " + (message === 0 ? "You have reached the upload limit." : "You may upload " + (message > 1 ? "up to " + message + " files." : "only one file.")));
-            return;
-        } else {
-            alert(message);
-        }
-
-    }
-
-    function fileDialogComplete (selected, queued) {
-        $.colorbox.hide();
-        if (!selected) return;
-        try { this.startUpload(); }
-        catch (ex) { this.debug(ex); }
-
-    }
-
-    function startUpload (file) {
-        this.targetCell.attr('class','').html('');
-        $('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(this.targetCell);
-        this.progressBar = this.targetCell.find('div.bar');
-    }
-
-    function uploadProgress (file, loaded, total) {
-        this.progressBar.animate({'width':Math.ceil((loaded/total)*76)+'px'},100);
-    }
-
-    function uploadSuccess (file, results) {
-         var filedata = false,targetCell = this.targetCell,i = this.targetLine;
-
-        $.colorbox.close();
-        try { filedata = $.parseJSON(results); }
-        catch (ex) { filedata.error = results; }
-        if (!filedata.id && !filedata.name) {
-            targetCell.html(NO_DOWNLOAD);
-            if (filedata.error) alert(filedata.error);
-            else alert(UNKNOWN_UPLOAD_ERROR);
-            return false;
-        }
-
-        filedata.type = filedata.type.replace(/\//gi," ");
-        $(this.progressBar).animate({'width':'76px'},250,function () {
-            $(this).parent().fadeOut(500,function() {
-                $(this).remove();
-                $(targetCell).attr('class', 'file').html(
-                    '<div class="icon shoppui-file ' + filedata.type + '"></div>' +
-                    filedata.name + '<br /><small>' + readableFileSize(filedata.size)+'</small>' +
-                    '<input type="hidden" name="price[' + i + '][download]" value="' + filedata.id + '" />'
-                );
-            });
-        }); 
-    }
-
-}
-
-function SlugEditor (id,type) {
+        } //init
+    }); // this.dropzone
+
+} // FileUploader
+
+function SlugEditor(id,type) {
     var $ = jQuery, _ = this,
         editbs = $('#edit-slug-buttons'),

shopp/trunk/core/ui/behaviors/editors.min.js

@@ -1 @@
-function NestedMenu(e,i,t,n,a,l,o){var r=jQuery,s=this;o||(o={axis:"y"}),s.items=l,s.dataname=t,s.index=e,s.element=r('<li><div class="move"></div><input type="hidden" name="'+t.replace("[","-").replace("]","-")+'-sortorder[]" value="'+e+'" class="sortorder" /><input type="hidden" name="'+t+"["+e+'][id]" class="id" /><input type="text" name="'+t+"["+e+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo(r(i).children("ul")),s.moveHandle=s.element.find("div.move"),s.sortorder=s.element.find("input.sortorder"),s.id=s.element.find("input.id"),s.label=s.element.find("input.label"),s.deleteButton=s.element.find("button.delete").bind("delete",function(){var e=r(i).find("input.deletes");""!=r(s.id).val()&&e.val(""==e.val()?r(s.id).val():e.val()+","+r(s.id).val()),l&&s.itemsElement.remove(),s.element.remove()}).click(function(){r(this).trigger("delete")}),s.items&&("list"==l.type?s.itemsElement=r("<ul></ul>").appendTo(l.target).hide():s.itemsElement=r("<li></li>").appendTo(l.target).hide()),s.selected=function(){r(i).find("ul li").removeClass("selected"),r(s.element).addClass("selected"),l&&(r(l.target).children().hide(),r(s.itemsElement).show())},s.element.click(this.selected).hover(function(){r(this).addClass("hover")},function(){r(this).removeClass("hover")}),s.label.mouseup(function(e){this.select()}).focus(function(){r(this).keydown(function(e){e.stopPropagation(),13==e.keyCode&&r(this).blur().unbind("keydown")})}),s.id.val(s.index),a&&a.id&&s.id.val(a.id),a&&a.name?s.label.val(htmlentities(a.name)):s.label.val(n+" "+s.index),r(i).children("ul").hasClass("ui-sortable")?r(i).children("ul").sortable("refresh"):r(i).children("ul").sortable(o)}function NestedMenuContent(e,i,t,n){var a=jQuery;this.contents=a('<textarea name="'+t+"["+e+'][value]" cols="40" rows="7"></textarea>').appendTo(i),n&&n.value&&this.contents.val(htmlentities(n.value))}function NestedMenuOption(e,i,t,n,a){var l=jQuery,o=this;o.index=l(i).contents().length,o.element=l('<li class="option"><div class="move"></div><input type="hidden" name="'+t+"["+e+"][options]["+this.index+'][id]" class="id" /><input type="text" name="'+t+"["+e+"][options]["+this.index+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo(i),o.moveHandle=o.element.find("div.move"),o.id=o.element.find("input.id"),o.label=o.element.find("input.label"),o.deleteButton=o.element.find("button.delete").click(function(){l(o.element).remove()}),o.element.hover(function(){l(this).addClass("hover")},function(){l(this).removeClass("hover")}),o.label.click(function(){this.select()}).focus(function(){l(this).keydown(function(e){e.stopPropagation(),13==e.keyCode&&l(this).blur().unbind("keydown")})}),o.id.val(o.index),a.id&&o.id.val(a.id),a.name&&o.label.val(htmlentities(a.name)),a.name||o.label.val(n+" "+(o.index+1))}function loadVariations(e,i){if(e){var t=jQuery;t.each(e,function(e,i){i&&i.id&&addVariationOptionsMenu(i)}),t.each(i,function(e,i){"variation"==i.context&&Pricelines.add(i.options.split(","),i,"#variations-pricing")}),Pricelines.updateVariationsUI(),t.each(e,function(e,i){i&&i.options&&t.each(i.options,function(e,i){i&&i.id&&"on"==i.linked&&Pricelines.linkVariations(i.id)})})}}function addVariationOptionsMenu(e){var i=jQuery,t=i("#variations-menu"),n=i("#variations-list"),a=(i("#addVariationMenu"),i("#addVariationOption")),l=i("#linkOptionVariations"),o=variationsidx,r=new NestedMenu(o,t,"meta[options][v]",OPTION_MENU_DEFAULT,e,{target:n,type:"list"},{axis:"y",update:function(){orderOptions(t,n)}});r.addOption=function(e){var t,o,s=!1;e||(e=new Object),e.id?e.id>optionsidx&&(optionsidx=e.id):(s=!0,e.id=optionsidx),t=new NestedMenuOption(r.index,r.itemsElement,"meta[options][v]",NEW_OPTION_DEFAULT,e),optionsidx++,o=t.id.val(),t.linkIcon=i('<span class="shoppui-link"></span>').appendTo(t.moveHandle),t.linked=i('<input type="hidden" name="meta[options][v]['+r.index+"][options]["+t.index+'][linked]" class="linked" />').val(e.linked?e.linked:"off").appendTo(t.element).change(function(){"on"==i(this).val()?t.linkIcon.removeClass("hidden"):t.linkIcon.addClass("hidden")}).change(),t.selected=function(){t.element.hasClass("selected")?(n.find("ul li").removeClass("selected"),selectedMenuOption=!1):(n.find("ul li").removeClass("selected"),i(t.element).addClass("selected"),selectedMenuOption=t),l.change()},t.element.click(t.selected),productOptions[o]=t.label,t.label.blur(function(){updateVariationLabels()}),t.deleteButton.unbind("click"),t.deleteButton.click(function(){1==r.itemsElement.children().length?deleteVariationPrices([o],!0):deleteVariationPrices([o]),t.element.remove()}),s?addVariationPrices():addVariationPrices(o),n.dequeue().animate({scrollTop:n.prop("scrollHeight")-n.height()},200),t.label.click().focus().select().keydown(function(e){var i=e.keyCode||e.which;9==i&&(e.preventDefault(),t.label.blur(),a.focus())}),r.items.push(t)},r.items=new Array,e&&e.options?i.each(e.options,function(){r.addOption(this)}):(r.addOption(),r.addOption()),r.itemsElement.sortable({axis:"y",update:function(){orderVariationPrices()}}),r.element.unbind("click",r.click).click(function(){r.selected(),i(a).unbind("click").click(r.addOption)}),optionMenus[variationsidx++]=r,r.deleteButton.unbind("click").click(function(){var e=new Array;i(r.itemsElement).find("li").not(".ui-sortable-helper").find("input.id").each(function(t,n){e.push(i(n).val())}),deleteVariationPrices(e,!0),i(this).trigger("delete")}),e||(n.dequeue().animate({scrollTop:n.attr("scrollHeight")-n.height()},200),r.label.click().focus().select().keydown(function(e){var i=e.keyCode||e.which;9==i&&(e.preventDefault(),a.focus())}))}function buildVariations(){var e,i,t,n,a=jQuery,l=new Array,o=a("#variations-list ul"),r=o.length,s=r-1,d=new Array(o.length),c=new Array(o.length),u=0;for(o.each(function(e,i){c[e]=a(i).children().length,0==u?u=a(i).children().length:u*=a(i).children().length,d[e]=0}),e=0;e<u;e++){for(i=0;i<o.length;i++)t=a(o[i]).children("li").not(".ui-sortable-helper").children("input.id"),l[e]?l[e].push(a(t[d[i]]).val()):l[e]=[a(t[d[i]]).val()];if(++d[s]>=c[s])for(n=s;n>-1;n--)d[n]<c[n]||(d[n]=0,n-1>-1&&d[n-1]++)}return l}function addVariationPrices(e){if(!e){var i,t,n=jQuery,a=buildVariations(),l=n("#variations-pricing"),o=n(l).children(),r=!1;n(a).each(function(e,n){i=xorkey(n),t=xorkey(n.slice(0,n.length-1)),""==t&&(t=-1),Pricelines.row[i]||(Pricelines.row[t]?(Pricelines.row[i]=Pricelines.row[t],delete Pricelines.row[t],Pricelines.row[i].setOptions(n)):(0==o.length?Pricelines.add(n,{context:"variation"},"#variations-pricing"):Pricelines.add(n,{context:"variation"},Pricelines.row[xorkey(a[e-1])].row,"after"),r=!0))}),r&&Pricelines.updateVariationsUI()}}function deleteVariationPrices(e,i){var t,n,a,l,o,r=jQuery,s=buildVariations(),d=!1;r(s).each(function(s,c){for(n=xorkey(c),t=0;t<e.length;t++)c.indexOf(e[t])!=-1&&(a=new Array,r(c).each(function(i,n){n!=e[t]&&a.push(n)}),l=xorkey(a),i&&!Pricelines.row[l]?(0!=l?Pricelines.row[l]=Pricelines.row[n]:Pricelines.row[n].row.remove(),delete Pricelines.row[n],Pricelines.row[l]&&(Pricelines.row[l].setOptions(a),d=!0)):Pricelines.row[n]&&(o=r("#priceid-"+Pricelines.row[n].id).val(),""==r("#deletePrices").val()?r("#deletePrices").val(o):r("#deletePrices").val(r("#deletePrices").val()+","+o),Pricelines.remove(n)))}),d&&Pricelines.updateVariationsUI()}function optionMenuExists(e){if(!e)return!1;var i=jQuery,t=!1;return i.each(optionMenus,function(n,a){if(a&&i(a.label).val()==e)return t=n}),optionMenus[t]?optionMenus[t]:t}function optionMenuItemExists(e,i){if(!e||!e.items||!i)return!1;var t=jQuery,n=!1;return t.each(e.items,function(e,a){if(a&&t(a.label).val()==i)return n=!0}),n}function updateVariationLabels(){var e=jQuery,i=buildVariations();e(i).each(function(e,i){var t=xorkey(i);Pricelines.row[t]&&Pricelines.row[t].updateLabel()})}function orderOptions(e,i){var t=jQuery;t(e).find("ul li").not(".ui-sortable-helper").find("input.id").each(function(e,n){n&&t(optionMenus[t(n).val()].itemsElement).appendTo(i)}),orderVariationPrices()}function orderVariationPrices(){var e,i=jQuery,t=buildVariations();i(t).each(function(i,t){e=xorkey(t),e>0&&Pricelines.row[e]&&Pricelines.reorderVariation(e,t)}),Pricelines.updateVariationsUI("tabs")}function xorkey(e){e instanceof Array||(e=[e]);for(var i=0,t=0;t<e.length;t++)i^=7001*e[t];return i}function variationsToggle(){var e=jQuery,i=e(this),t=e("#variations"),n=e("#product-pricing");i.prop("checked")?(Pricelines.row[0]&&Pricelines.row[0].disable(),n.hide(),t.show()):(t.hide(),n.show(),Pricelines.row[0]&&Pricelines.row[0].enable())}function addonsToggle(){var e=jQuery,i=e(this),t=e("#addons");i.prop("checked")?t.show():t.hide()}function clearLinkedIcons(){jQuery("#variations-list input.linked").val("off").change()}function linkVariationsButton(){var e=jQuery;selectedMenuOption?"off"==selectedMenuOption.linked.val()?(Pricelines.allLinked()&&(clearLinkedIcons(),Pricelines.unlinkAll()),selectedMenuOption.linked.val("on").change(),Pricelines.linkVariations(selectedMenuOption.id.val())):(selectedMenuOption.linked.val("off").change(),Pricelines.unlinkVariations(selectedMenuOption.id.val())):(clearLinkedIcons(),Pricelines.allLinked()?Pricelines.unlinkAll():Pricelines.linkAll()),e(this).change()}function linkVariationsButtonLabel(){var e=jQuery;selectedMenuOption?"on"==selectedMenuOption.linked.val()?e(this).find("small").html(" "+UNLINK_VARIATIONS):e(this).find("small").html(" "+LINK_VARIATIONS):Pricelines.allLinked()?e(this).find("small").html(" "+UNLINK_ALL_VARIATIONS):e(this).find("small").html(" "+LINK_ALL_VARIATIONS)}function loadAddons(e,i){var t=jQuery;e&&(t.each(e,function(e,i){newAddonGroup(i)}),t.each(i,function(e,i){if("addon"==i.context){var t=addonOptionsGroup[i.options];Pricelines.add(i.options,this,"#addon-pricegroup-"+t)}}),Pricelines.updateVariationsUI())}function newAddonGroup(e){var i=jQuery,t=i("#addon-menu"),n=i("#addon-list"),a=i("#newAddonGroup"),l=i("#addAddonOption"),o=addon_group_idx,r=new NestedMenu(o,t,"meta[options][a]",ADDON_GROUP_DEFAULT,e,{target:n,type:"list"},{axis:"y",update:function(){orderAddonGroups()}});r.itemsElement.attr("id","addon-group-"+o),r.pricegroup=i('<div id="addon-pricegroup-'+o+'" />').appendTo("#addon-pricing"),r.pricegroupLabel=i("<label />").html("<h4>"+r.label.val()+"</h4>").prependTo(r.pricegroup),r.updatePriceLabel=function(){r.pricegroupLabel.html("<h4>"+r.label.val()+"</h4>")},r.label.blur(r.updatePriceLabel),r.addOption=function(e){var t,a,o=!1;e||(e=new Object),e.id?e.id>addonsidx&&(addonsidx=e.id):(o=!0,e.id=addonsidx),t=new NestedMenuOption(r.index,r.itemsElement,"meta[options][a]",NEW_OPTION_DEFAULT,e),addonsidx++,a=t.id.val(),t.selected=function(){t.element.hasClass("selected")?(n.find("ul li").removeClass("selected"),selectedMenuOption=!1):(n.find("ul li").removeClass("selected"),i(t.element).addClass("selected"),selectedMenuOption=t)},t.element.click(t.selected),productAddons[a]=t.label,t.label.blur(function(){Pricelines.row[a].updateLabel()}),t.deleteButton.unbind("click"),t.deleteButton.click(function(){var e=Pricelines.row[a].data.id,n=i("#deletePrices");e&&(""==n.val()?n.val(e):n.val(n.val()+","+e)),Pricelines.row[a].row.remove(),t.element.remove()}),o&&Pricelines.add(a,{context:"addon"},r.pricegroup),addonOptionsGroup[a]=r.index,r.items.push(t),n.dequeue().animate({scrollTop:n.attr("scrollHeight")-n.height()},200),t.label.click().focus().select().keydown(function(e){var i=e.keyCode||e.which;9==i&&(e.preventDefault(),t.label.blur(),l.focus())})},r.items=new Array,e&&e.options?i.each(e.options,function(){r.addOption(this)}):(r.addOption(),r.addOption()),r.itemsElement.sortable({axis:"y",update:function(){orderAddonPrices(r.index)}}),r.element.unbind("click",r.click),r.element.click(function(){r.selected(),i(l).unbind("click").click(r.addOption)}),addonGroups[addon_group_idx++]=r,r.deleteButton.unbind("click").click(function(){i("#addon-list #addon-group-"+r.index+" li").not(".ui-sortable-helper").find("input.id").each(function(e,t){var n,a=i(t).val(),l=i("#deletePrices");Pricelines.row[a]&&(n=Pricelines.row[a].data.id,n&&(""==l.val()?l.val(n):l.val(l.val()+","+n)),Pricelines.row[a].row.remove())}),r.deleteButton.trigger("delete"),r.pricegroup.remove(),r.element.remove()}),e||(t.dequeue().animate({scrollTop:t.attr("scrollHeight")-t.height()},200),r.label.click().focus().select().keydown(function(e){var i=e.keyCode||e.which;9==i&&(e.preventDefault(),r.label.blur(),a.focus())}))}function orderAddonGroups(){var e,i=jQuery;i("#addon-menu ul li").not(".ui-sortable-helper").find("input.id").each(function(t,n){e=addonGroups[i(n).val()],e.pricegroup.appendTo("#addon-pricing")})}function orderAddonPrices(e){var i=jQuery,t=addonGroups[e];i("#addon-list #addon-group-"+t.index+" li").not(".ui-sortable-helper").find("input.id").each(function(e,n){Pricelines.reorderAddon(i(n).val(),t.pricegroup)})}function readableFileSize(e){var i=new Array("bytes","KB","MB","GB"),t=1*e,n=0;if(0==t)return t;for(;t>1e3;)t/=1024,n++;return t.toFixed(2)+" "+i[n]}function addDetail(e){var i,t,n=jQuery,a=n("#details-menu"),l=n("#details-list"),o=detailsidx++,r=new NestedMenu(o,a,"details","Detail Name",e,{target:l});if(e&&e.options){t=n('<select name="details['+r.index+'][value]"></select>').appendTo(r.itemsElement),n("<option></option>").appendTo(t);for(i in e.options)n("<option>"+e.options[i].name+"</option>").appendTo(t);e&&e.value&&t.val(htmlentities(e.value))}else r.item=new NestedMenuContent(r.index,r.itemsElement,"details",e);e&&!e.add||(r.add=n('<input type="hidden" name="details['+r.index+'][new]" value="true" />').appendTo(r.element),a.dequeue().animate({scrollTop:a.attr("scrollHeight")-a.height()},200),r.label.click().focus().select(),r.item&&r.item.contents.keydown(function(e){var i=e.keyCode||e.which;9==i&&(e.preventDefault(),n("#addDetail").focus())}))}function ImageUploads(e,i){function t(){p("#browser-uploader").hide(),u.loaded=!0}function n(){p("#lightbox li").size()>0&&p("#lightbox").sortable({opacity:.8})}function a(e,i,t){return i==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED?void alert("You selected too many files to upload at one time. "+(0===t?"You have reached the upload limit.":"You may upload "+(t>1?"up to "+t+" files.":"only one file."))):void alert(t)}function l(e,i){try{this.startUpload()}catch(e){this.debug(e)}}function o(e){this.targetHolder=p('<li class="image uploading"><input type="hidden" name="images[]" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo(p("#lightbox")),this.progressBar=this.targetHolder.find("div.bar"),this.sorting=this.targetHolder.find("input")}function r(e,i,t){this.progressBar.animate({width:Math.ceil(i/t*76)+"px"},100)}function s(e,i,t){}function d(e,i){var t,a,l=!1,o=this.targetHolder;try{l=p.parseJSON(i)}catch(e){return o.remove(),alert(i),!1}return l.id?(o.attr({id:"image-"+l.id}),this.sorting.val(l.id),t=p('<img src="?siid='+l.id+'" width="96" height="96" class="handle" />').appendTo(o).hide(),a=p('<button type="button" name="deleteImage" value="'+l.id+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo(o).hide(),n(),void this.progressBar.animate({width:"76px"},250,function(){p(this).parent().fadeOut(500,function(){p(this).remove(),p(t).fadeIn("500"),c(a)})})):(o.remove(),l.error?alert(l.error):alert(UNKNOWN_UPLOAD_ERROR),!0)}function c(e){e.hide(),e.parent().hover(function(){e.show()},function(){e.hide()}),e.click(function(){if(confirm(DELETE_IMAGE_WARNING)){var i="<"==e.val().substr(0,1)?e.find("input[name=ieisstupid]").val():e.val(),t=p("#deleteImages"),n=t.val();t.val(""==n?i:n+","+i),p("#confirm-delete-images").show(),e.parent().fadeOut(500,function(){p(this).remove()})}})}var u,p=jQuery,h={button_text:ADD_IMAGE_BUTTON_TEXT,button_text_style:'.buttonText{text-align:center;font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,_sans;font-size:9px;color:#333333;}',button_text_top_padding:3,button_height:"18",button_width:"100",button_image_url:uidir+"/icons/buttons.png",button_placeholder_id:"swf-uploader-button",upload_url:ajaxurl,flash_url:uidir+"/behaviors/swfupload.swf",file_queue_limit:0,file_size_limit:filesizeLimit+"b",file_types:"*.jpg;*.jpeg;*.png;*.gif",file_types_description:"Web-compatible Image Files",file_upload_limit:filesizeLimit,post_params:{action:"shopp_upload_image",parent:e,type:i},swfupload_loaded_handler:t,file_queue_error_handler:a,file_dialog_complete_handler:l,upload_start_handler:o,upload_progress_handler:r,upload_error_handler:s,upload_success_handler:d,custom_settings:{loaded:!1,targetHolder:!1,progressBar:!1,sorting:!1},prevent_swf_caching:p.ua.msie,debug:imageupload_debug};flashuploader&&(u=new SWFUpload(h)),p("#image-upload").upload({name:"Filedata",action:ajaxurl,params:{action:"shopp_upload_image",type:i},onSubmit:function(){this.targetHolder=p('<li id="image-uploading"><input type="hidden" name="images[]" value="" /><div class="progress"><div class="bar"></div><div class="gloss"></div></div></li>').appendTo("#lightbox"),this.progressBar=this.targetHolder.find("div.bar"),this.sorting=this.targetHolder.find("input")},onComplete:function(e){var i,t,n=!1,a=this.targetHolder;try{n=p.parseJSON(e)}catch(i){n.error=e}return n&&n.id?(a.attr({id:"image-"+n.id}),this.sorting.val(n.id),i=p('<img src="?siid='+n.id+'" width="96" height="96" class="handle" />').appendTo(a).hide(),t=p('<button type="button" name="deleteImage" value="'+n.src+'" class="delete"><span class="shoppui-minus"></span></button>').appendTo(p(a)).hide(),void p(this.progressBar).animate({width:"76px"},250,function(){p(this).parent().fadeOut(500,function(){p(this).remove(),p(i).fadeIn("500"),c(t)})})):(a.remove(),n.error?alert(n.error):alert(UNKNOWN_UPLOAD_ERROR),!1)}}),p(document).load(function(){u.loaded||p("#product-images .swfupload").remove()}),n(),p("#lightbox li").each(function(){p(this).dblclick(function(){var e=p(this).attr("id")+"-details",i=p("#"+e),t=i.find("input[type=hidden]").val(),n=i.find("img"),a=i.find("input.imagetitle"),l=i.find("input.imagealt"),o=i.find("input.imagecropped"),r=p('<div class="image-details-editor"><div class="details-editor"><img class="thumb" width="96" height="96" /><div class="details"><p><label>'+IMAGE_DETAILS_TITLE_LABEL+': </label><input type="text" name="title" /></p><p><label>'+IMAGE_DETAILS_ALT_LABEL+': </label><input type="text" name="alt" /></p></div></div><div class="cropping"><p class="clear">'+IMAGE_DETAILS_CROP_LABEL+': <select name="cropimage"><option></option></select></p><div class="cropui"></div><br class="clear"/></div><input type="button" class="button-primary alignright" value="&nbsp;&nbsp;'+IMAGE_DETAILS_DONE+'&nbsp;&nbsp;" /></div>'),s=(r.find("img").attr("src",n.attr("src")),r.find("input[name=title]").val(a.val()).change(function(){a.val(s.val())})),d=r.find("input[name=alt]").val(l.val()).change(function(){l.val(d.val())}),c=(r.find("input[type=button]").click(function(){p.colorbox.close()}),r.find("div.cropping").hide()),u=r.find("div.cropui"),h=r.find("select[name=cropimage]").change(function(){if(""==h.val())return u.empty(),void p.colorbox.resize();var e=h.val().split(":"),i=o.filter("input[alt="+h.val()+"]").val().split(",");u.empty().scaleCrop({imgsrc:"?siid="+t,target:{width:parseInt(e[0],10),height:parseInt(e[1],10)},init:{x:parseInt(i[0],10),y:parseInt(i[1],10),s:new Number(i[2])}}).ready(function(){var i=125;p.colorbox.resize({innerWidth:parseInt(e[0],10)+i})}).bind("change.scalecrop",function(e,i){i.s||(i.s=1),i&&o.filter("input[alt="+h.val()+"]").val(i.x+","+i.y+","+i.s)})});o.size()>0&&(o.each(function(e,i){var t=p(i).attr("alt");p('<option value="'+t+'">'+(e+1)+": "+t.replace(":","&times;")+"</option>").appendTo(h)}),c.show()),p.colorbox({title:IMAGE_DETAILS_TEXT,html:r})}),c(p(this).find("button.delete"))})}function FileUploader(e,i){function t(){s(i).hide(),this.loaded=!0}function n(e,i,t){return i==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED?void alert("You selected too many files to upload at one time. "+(0===t?"You have reached the upload limit.":"You may upload "+(t>1?"up to "+t+" files.":"only one file."))):void alert(t)}function a(e,i){if(s.colorbox.hide(),e)try{this.startUpload()}catch(e){this.debug(e)}}function l(e){this.targetCell.attr("class","").html(""),s('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(this.targetCell),this.progressBar=this.targetCell.find("div.bar")}function o(e,i,t){this.progressBar.animate({width:Math.ceil(i/t*76)+"px"},100)}function r(e,i){var t=!1,n=this.targetCell,a=this.targetLine;s.colorbox.close();try{t=s.parseJSON(i)}catch(e){t.error=i}return t.id||t.name?(t.type=t.type.replace(/\//gi," "),void s(this.progressBar).animate({width:"76px"},250,function(){s(this).parent().fadeOut(500,function(){s(this).remove(),s(n).attr("class","file").html('<div class="icon shoppui-file '+t.type+'"></div>'+t.name+"<br /><small>"+readableFileSize(t.size)+'</small><input type="hidden" name="price['+a+'][download]" value="'+t.id+'" />')})})):(n.html(NO_DOWNLOAD),t.error?alert(t.error):alert(UNKNOWN_UPLOAD_ERROR),!1)}var s=jQuery,d=this;d.swfu=!1,d.settings={button_text:UPLOAD_FILE_BUTTON_TEXT,button_text_style:'.buttonText{text-align:center;font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,_sans;font-size:9px;color:#333333; }',button_text_top_padding:3,button_height:"22",button_width:"100",button_image_url:uidir+"/icons/buttons.png",button_placeholder_id:e,button_action:SWFUpload.BUTTON_ACTION.SELECT_FILE,flash_url:uidir+"/behaviors/swfupload.swf",upload_url:ajaxurl,file_queue_limit:1,file_size_limit:filesizeLimit+"b",file_types:"*.*",file_types_description:"All Files",file_upload_limit:filesizeLimit,post_params:{action:"shopp_upload_file"},swfupload_loaded_handler:t,file_queue_error_handler:n,file_dialog_complete_handler:a,upload_start_handler:l,upload_progress_handler:o,upload_success_handler:r,custom_settings:{loaded:!1,targetCell:!1,targetLine:!1,progressBar:!1},prevent_swf_caching:s.ua.msie,debug:fileupload_debug},flashuploader&&(d.swfu=new SWFUpload(d.settings)),i.upload({name:"Filedata",action:ajaxurl,params:{action:"shopp_upload_file"},onSubmit:function(){s.colorbox.hide(),d.targetCell.attr("class","").html(""),s('<div class="progress"><div class="bar"></div><div class="gloss"></div></div>').appendTo(d.targetCell),d.progressBar=d.targetCell.find("div.bar")},onComplete:function(e){s.colorbox.close();var i=!1,t=d.targetCell;try{i=s.parseJSON(e)}catch(t){i.error=e}return i.id||i.name?(i.type=i.type.replace(/\//gi," "),void s(d.progressBar).animate({width:"76px"},250,function(){s(this).parent().fadeOut(500,function(){t.attr("class","file").html('<div class="icon shoppui-file '+i.type+'"></div>'+i.name+"<br /><small>"+readableFileSize(i.size)+'</small><input type="hidden" name="price['+d.targetLine+'][download]" value="'+i.id+'" />'),s(this).remove()})})):(t.html(NO_DOWNLOAD),i.error?alert(i.error):alert(UNKNOWN_UPLOAD_ERROR),!1)}}),s(d).load(function(){d.swfu&&d.swfu.loaded||s(i).parent().parent().find(".swfupload").remove()}),d.updateLine=function(e,i){d.swfu?(d.swfu.targetLine=e,d.swfu.targetCell=i):(d.targetLine=e,d.targetCell=i)}}function SlugEditor(e,i){var t=jQuery,n=this,a=t("#edit-slug-buttons"),l=a.find(".edit"),o=a.find(".view"),r=t("#editor-slug-buttons"),s=r.find(".save"),d=r.find(".cancel"),c=t("#editable-slug-full");n.permalink=function(){var n,l=0,u=t("#editable-slug"),p=u.html(),h=t("#slug_input"),f=h.html(),m=c.html();for(a.hide(),r.show(),s.unbind("click").click(function(){var n=u.children("input").val(),l=t("#title").val();t.post(editslug_url+"&action=shopp_edit_slug",{id:e,type:i,slug:n,title:l},function(e){u.html(p),e!=-1&&(u.html(e),c.html(e),h.val(e)),o.attr("href",canonurl+c.html()),r.hide(),a.show()},"text")}),d.unbind("click").click(function(){u.html(p),r.hide(),a.show(),h.attr("value",f)}),n=0;n<m.length;++n)"%"==m.charAt(n)&&l++;slug_value=l>m.length/4?"":m,u.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(e){var i=e.which;13!=i&&27!=i||e.preventDefault(),13==i&&s.click(),27==i&&d.click(),h.val(this.value)}).focus()},l.click(n.permalink)}jQuery.fn.FileChooser=function(e,i){var t=jQuery,n=this,a=t("#chooser"),l=a.find(".fileimport"),o=a.find(".status"),r=t("#attach-file"),s=t("#download_path-"+e),d=t("#download_file-"+e),c=t("#file-"+e),u=!1,p=0;n.line=e,n.status=i,a.unbind("change").on("change",".fileimport",function(e){o.attr("class","status").addClass("shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8"),t.ajax({url:fileverify_url+"&action=shopp_verify_file&t=download",type:"POST",data:"url="+l.val(),timeout:1e4,dataType:"text",success:function(e){return o.attr("class","status"),"OK"==e?o.addClass("shoppui-ok-sign"):("NULL"==e&&o.attr("title",FILE_NOT_FOUND_TEXT),"ISDIR"==e&&o.attr("title",FILE_ISDIR_TEXT),"READ"==e&&o.attr("title",FILE_NOT_READ_TEXT),void o.addClass("shoppui-warning-sign"))}})}),l.unbind("keydown").unbind("keypress").suggest(sugg_url+"&action=shopp_storage_suggestions&t=download",{delay:500,minchars:3,multiple:!1,onSelect:function(){l.trigger("change")}}),t(this).click(function(){fileUploads.updateLine(e,i),o.attr("class","status"),r.unbind("click").click(function(){if(t.colorbox.hide(),u)return s.val(l.val()),l.val("").attr("class","fileimport"),!0;var i=!1,n=l.val(),a=function(e){return e.name?(c.attr("class","file").html('<span class="icon shoppui-file '+e.mime.replace("/"," ")+'"></span>'+e.name+"<br /><small>"+readableFileSize(e.size)+"</small>"),s.val(e.path),d.val(e.name),void l.val("").attr("class","fileimport")):$this.attr("class","")},o=function(){var n=c.find("div.progress"),l=n.find("div.bar"),r=n.outerWidth(),s=t("#import-file-"+e).get(0).contentWindow,d=s.importProgress,u=s.importFile;if(void 0!==u){if(u.error)return c.attr("class","error").html("<small>"+u.error+"</small>");if(!u.path)return c.attr("class","error").html("<small>"+FILE_UNKNOWN_IMPORT_ERROR+"</small>");if(u.stored)return a(u);savepath=u.path.split("/"),i=savepath[savepath.length-1]}return d||(d=0),0===d&&p++>60?c.attr("class","error").html("<small>"+FILE_UNKNOWN_IMPORT_ERROR+"</small>"):(l.animate({width:Math.ceil(d*r)+"px"},100),1==d?void(l&&l.css({width:"100%"}).fadeOut(500,function(){a(u)})):void setTimeout(o,100))};setTimeout(o,100),c.attr("class","").html('<div class="progress"><div class="bar"></div><div class="gloss"></div></div><iframe id="import-file-'+e+'" width="0" height="0" src="'+fileimport_url+"&action=shopp_import_file&url="+n+'"></iframe>')})}),t(this).colorbox({title:"File Selector",innerWidth:"360",innerHeight:"140",inline:!0,href:a})};
+function NestedMenu(e,i,n,t,l,o,a){var s=jQuery,r=this;a||(a={axis:"y"}),r.items=o,r.dataname=n,r.index=e,r.element=s('<li><div class="move"></div><input type="hidden" name="'+n.replace("[","-").replace("]","-")+'-sortorder[]" value="'+e+'" class="sortorder" /><input type="hidden" name="'+n+"["+e+'][id]" class="id" /><input type="text" name="'+n+"["+e+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo(s(i).children("ul")),r.moveHandle=r.element.find("div.move"),r.sortorder=r.element.find("input.sortorder"),r.id=r.element.find("input.id"),r.label=r.element.find("input.label"),r.deleteButton=r.element.find("button.delete").bind("delete",function(){var e=s(i).find("input.deletes");""!=s(r.id).val()&&e.val(""==e.val()?s(r.id).val():e.val()+","+s(r.id).val()),o&&r.itemsElement.remove(),r.element.remove()}).click(function(){s(this).trigger("delete")}),r.items&&("list"==o.type?r.itemsElement=s("<ul></ul>").appendTo(o.target).hide():r.itemsElement=s("<li></li>").appendTo(o.target).hide()),r.selected=function(){s(i).find("ul li").removeClass("selected"),s(r.element).addClass("selected"),o&&(s(o.target).children().hide(),s(r.itemsElement).show())},r.element.click(this.selected).hover(function(){s(this).addClass("hover")},function(){s(this).removeClass("hover")}),r.label.mouseup(function(e){this.select()}).focus(function(){s(this).keydown(function(e){e.stopPropagation(),13==e.keyCode&&s(this).blur().unbind("keydown")})}),r.id.val(r.index),l&&l.id&&r.id.val(l.id),l&&l.name?r.label.val(htmlentities(l.name)):r.label.val(t+" "+r.index),s(i).children("ul").hasClass("ui-sortable")?s(i).children("ul").sortable("refresh"):s(i).children("ul").sortable(a)}function NestedMenuContent(e,i,n,t){var l=jQuery;this.contents=l('<textarea name="'+n+"["+e+'][value]" cols="40" rows="7"></textarea>').appendTo(i),t&&t.value&&this.contents.val(htmlentities(t.value))}function NestedMenuOption(e,i,n,t,l){var o=jQuery,a=this;a.index=o(i).contents().length,a.element=o('<li class="option"><div class="move"></div><input type="hidden" name="'+n+"["+e+"][options]["+this.index+'][id]" class="id" /><input type="text" name="'+n+"["+e+"][options]["+this.index+'][name]" class="label" /><button type="button" class="delete"><span class="shoppui-minus"></span></button></li>').appendTo(i),a.moveHandle=a.element.find("div.move"),a.id=a.element.find("input.id"),a.label=a.element.find("input.label"),a.deleteButton=a.element.find("button.delete").click(function(){o(a.element).remove()}),a.element.hover(function(){o(this).addClass("hover")},function(){o(this).removeClass("hover")}),a.label.click(function(){this.select()}).focus(function(){o(this).keydown(function(e){e.stopPropagation(),13==e.keyCode&&o(this).blur().unbind("keydown")})}),a.id.val(a.index),l.id&&a.id.val(l.id),l.name&&a.label.val(htmlentities(l.name)),l.name||a.label.val(t+" "+(a.index+1))}function loadVariations(e,i){if(e){var n=jQuery;n.each(e,function(e,i){i&&i.id&&addVariationOptionsMenu(i)}),n.each(i,function(e,i){"variation"==i.context&&Pricelines.add(i.options.split(","),i,"#variations-pricing")}),Pricelines.updateVariationsUI(),n.each(e,function(e,i){i&&i.options&&n.each(i.options,function(e,i){i&&i.id&&"on"==i.linked&&Pricelines.linkVariations(i.id)})})}}function addVariationOptionsMenu(e){var i=jQuery,n=i("#variations-menu"),t=i("#variations-list"),l=(i("#addVariationMenu"),i("#addVariationOption")),o=i("#linkOptionVariations"),a=new NestedMenu(variationsidx,n,"meta[options][v]",OPTION_MENU_DEFAULT,e,{target:t,type:"list"},{axis:"y",update:function(){orderOptions(n,t)}});a.addOption=function(e){var n,s,r=!1;e||(e=new Object),e.id?e.id>optionsidx&&(optionsidx=e.id):(r=!0,e.id=optionsidx),n=new NestedMenuOption(a.index,a.itemsElement,"meta[options][v]",NEW_OPTION_DEFAULT,e),optionsidx++,s=n.id.val(),n.linkIcon=i('<span class="shoppui-link"></span>').appendTo(n.moveHandle),n.linked=i('<input type="hidden" name="meta[options][v]['+a.index+"][options]["+n.index+'][linked]" class="linked" />').val(e.linked?e.linked:"off").appendTo(n.element).change(function(){"on"==i(this).val()?n.linkIcon.removeClass("hidden"):n.linkIcon.addClass("hidden")}).change(),n.selected=function(){n.element.hasClass("selected")?(t.find("ul li").removeClass("selected"),selectedMenuOption=!1):(t.find("ul li").removeClass("selected"),i(n.element).addClass("selected"),selectedMenuOption=n),o.change()},n.element.click(n.selected),productOptions[s]=n.label,n.label.blur(function(){updateVariationLabels()}),n.deleteButton.unbind("click"),n.deleteButton.click(function(){1==a.itemsElement.children().length?deleteVariationPrices([s],!0):deleteVariationPrices([s]),n.element.remove()}),r?addVariationPrices():addVariationPrices(s),t.dequeue().animate({scrollTop:t.prop("scrollHeight")-t.height()},200),n.label.click().focus().select().keydown(function(e){9==(e.keyCode||e.which)&&(e.preventDefault(),n.label.blur(),l.focus())}),a.items.push(n)},a.items=new Array,e&&e.options?i.each(e.options,function(){a.addOption(this)}):(a.addOption(),a.addOption()),a.itemsElement.sortable({axis:"y",update:function(){orderVariationPrices()}}),a.element.unbind("click",a.click).click(function(){a.selected(),i(l).unbind("click").click(a.addOption)}),optionMenus[variationsidx++]=a,a.deleteButton.unbind("click").click(function(){var e=new Array;i(a.itemsElement).find("li").not(".ui-sortable-helper").find("input.id").each(function(n,t){e.push(i(t).val())}),deleteVariationPrices(e,!0),i(this).trigger("delete")}),e||(t.dequeue().animate({scrollTop:t.attr("scrollHeight")-t.height()},200),a.label.click().focus().select().keydown(function(e){9==(e.keyCode||e.which)&&(e.preventDefault(),l.focus())}))}function buildVariations(){var e,i,n,t,l=jQuery,o=new Array,a=l("#variations-list ul"),s=a.length-1,r=new Array(a.length),d=new Array(a.length),c=0;for(a.each(function(e,i){d[e]=l(i).children().length,0==c?c=l(i).children().length:c*=l(i).children().length,r[e]=0}),e=0;e<c;e++){for(i=0;i<a.length;i++)n=l(a[i]).children("li").not(".ui-sortable-helper").children("input.id"),o[e]?o[e].push(l(n[r[i]]).val()):o[e]=[l(n[r[i]]).val()];if(++r[s]>=d[s])for(t=s;t>-1;t--)r[t]<d[t]||(r[t]=0,t-1>-1&&r[t-1]++)}return o}function addVariationPrices(e){if(!e){var i,n,t=jQuery,l=buildVariations(),o=t(t("#variations-pricing")).children(),a=!1;t(l).each(function(e,t){i=xorkey(t),""==(n=xorkey(t.slice(0,t.length-1)))&&(n=-1),Pricelines.row[i]||(Pricelines.row[n]?(Pricelines.row[i]=Pricelines.row[n],delete Pricelines.row[n],Pricelines.row[i].setOptions(t)):(0==o.length?Pricelines.add(t,{context:"variation"},"#variations-pricing"):Pricelines.add(t,{context:"variation"},Pricelines.row[xorkey(l[e-1])].row,"after"),a=!0))}),a&&Pricelines.updateVariationsUI()}}function deleteVariationPrices(e,i){var n,t,l,o,a,s=jQuery,r=buildVariations(),d=!1;s(r).each(function(r,c){for(t=xorkey(c),n=0;n<e.length;n++)-1!=c.indexOf(e[n])&&(l=new Array,s(c).each(function(i,t){t!=e[n]&&l.push(t)}),o=xorkey(l),i&&!Pricelines.row[o]?(0!=o?Pricelines.row[o]=Pricelines.row[t]:Pricelines.row[t].row.remove(),delete Pricelines.row[t],Pricelines.row[o]&&(Pricelines.row[o].setOptions(l),d=!0)):Pricelines.row[t]&&(a=s("#priceid-"+Pricelines.row[t].id).val(),""==s("#deletePrices").val()?s("#deletePrices").val(a):s("#deletePrices").val(s("#deletePrices").val()+","+a),Pricelines.remove(t)))}),d&&Pricelines.updateVariationsUI()}function optionMenuExists(e){if(!e)return!1;var i=jQuery,n=!1;return i.each(optionMenus,function(t,l){if(l&&i(l.label).val()==e)return n=t}),optionMenus[n]?optionMenus[n]:n}function optionMenuItemExists(e,i){if(!e||!e.items||!i)return!1;var n=jQuery,t=!1;return n.each(e.items,function(e,l){if(l&&n(l.label).val()==i)return t=!0}),t}function updateVariationLabels(){jQuery(buildVariations()).each(function(e,i){var n=xorkey(i);Pricelines.row[n]&&Pricelines.row[n].updateLabel()})}function orderOptions(e,i){var n=jQuery;n(e).find("ul li").not(".ui-sortable-helper").find("input.id").each(function(e,t){t&&n(optionMenus[n(t).val()].itemsElement).appendTo(i)}),orderVariationPrices()}function orderVariationPrices(){var e;jQuery(buildVariations()).each(function(i,n){(e=xorkey(n))>0&&Pricelines.row[e]&&Pricelines.reorderVariation(e,n)}),Pricelines.updateVariationsUI("tabs")}function xorkey(e){e instanceof Array||(e=[e]);for(var i=0,n=0;n<e.length;n++)i^=7001*e[n];return i}function variationsToggle(){var e=jQuery,i=e(this),n=e("#variations"),t=e("#product-pricing");i.prop("checked")?(Pricelines.row[0]&&Pricelines.row[0].disable(),t.hide(),n.show()):(n.hide(),t.show(),Pricelines.row[0]&&Pricelines.row[0].enable())}function addonsToggle(){var e=jQuery,i=e(this),n=e("#addons");i.prop("checked")?n.show():n.hide()}function clearLinkedIcons(){jQuery("#variations-list input.linked").val("off").change()}function linkVariationsButton(){var e=jQuery;selectedMenuOption?"off"==selectedMenuOption.linked.val()?(Pricelines.allLinked()&&(clearLinkedIcons(),Pricelines.unlinkAll()),selectedMenuOption.linked.val("on").change(),Pricelines.linkVariations(selectedMenuOption.id.val())):(selectedMenuOption.linked.val("off").change(),Pricelines.unlinkVariations(selectedMenuOption.id.val())):(clearLinkedIcons(),Pricelines.allLinked()?Pricelines.unlinkAll():Pricelines.linkAll()),e(this).change()}function linkVariationsButtonLabel(){var e=jQuery;selectedMenuOption?"on"==selectedMenuOption.linked.val()?e(this).find("small").html(" "+UNLINK_VARIATIONS):e(this).find("small").html(" "+LINK_VARIATIONS):Pricelines.allLinked()?e(this).find("small").html(" "+UNLINK_ALL_VARIATIONS):e(this).find("small").html(" "+LINK_ALL_VARIATIONS)}function loadAddons(e,i){var n=jQuery;e&&(n.each(e,function(e,i){newAddonGroup(i)}),n.each(i,function(e,i){if("addon"==i.context){var n=addonOptionsGroup[i.options];Pricelines.add(i.options,this,"#addon-pricegroup-"+n)}}),Pricelines.updateVariationsUI())}function newAddonGroup(e){var i=jQuery,n=i("#addon-menu"),t=i("#addon-list"),l=i("#newAddonGroup"),o=i("#addAddonOption"),a=addon_group_idx,s=new NestedMenu(a,n,"meta[options][a]",ADDON_GROUP_DEFAULT,e,{target:t,type:"list"},{axis:"y",update:function(){orderAddonGroups()}});s.itemsElement.attr("id","addon-group-"+a),s.pricegroup=i('<div id="addon-pricegroup-'+a+'" />').appendTo("#addon-pricing"),s.pricegroupLabel=i("<label />").html("<h4>"+s.label.val()+"</h4>").prependTo(s.pricegroup),s.updatePriceLabel=function(){s.pricegroupLabel.html("<h4>"+s.label.val()+"</h4>")},s.label.blur(s.updatePriceLabel),s.addOption=function(e){var n,l,a=!1;e||(e=new Object),e.id?e.id>addonsidx&&(addonsidx=e.id):(a=!0,e.id=addonsidx),n=new NestedMenuOption(s.index,s.itemsElement,"meta[options][a]",NEW_OPTION_DEFAULT,e),addonsidx++,l=n.id.val(),n.selected=function(){n.element.hasClass("selected")?(t.find("ul li").removeClass("selected"),selectedMenuOption=!1):(t.find("ul li").removeClass("selected"),i(n.element).addClass("selected"),selectedMenuOption=n)},n.element.click(n.selected),productAddons[l]=n.label,n.label.blur(function(){Pricelines.row[l].updateLabel()}),n.deleteButton.unbind("click"),n.deleteButton.click(function(){var e=Pricelines.row[l].data.id,t=i("#deletePrices");e&&(""==t.val()?t.val(e):t.val(t.val()+","+e)),Pricelines.row[l].row.remove(),n.element.remove()}),a&&Pricelines.add(l,{context:"addon"},s.pricegroup),addonOptionsGroup[l]=s.index,s.items.push(n),t.dequeue().animate({scrollTop:t.attr("scrollHeight")-t.height()},200),n.label.click().focus().select().keydown(function(e){9==(e.keyCode||e.which)&&(e.preventDefault(),n.label.blur(),o.focus())})},s.items=new Array,e&&e.options?i.each(e.options,function(){s.addOption(this)}):(s.addOption(),s.addOption()),s.itemsElement.sortable({axis:"y",update:function(){orderAddonPrices(s.index)}}),s.element.unbind("click",s.click),s.element.click(function(){s.selected(),i(o).unbind("click").click(s.addOption)}),addonGroups[addon_group_idx++]=s,s.deleteButton.unbind("click").click(function(){i("#addon-list #addon-group-"+s.index+" li").not(".ui-sortable-helper").find("input.id").each(function(e,n){var t,l=i(n).val(),o=i("#deletePrices");Pricelines.row[l]&&((t=Pricelines.row[l].data.id)&&(""==o.val()?o.val(t):o.val(o.val()+","+t)),Pricelines.row[l].row.remove())}),s.deleteButton.trigger("delete"),s.pricegroup.remove(),s.element.remove()}),e||(n.dequeue().animate({scrollTop:n.attr("scrollHeight")-n.height()},200),s.label.click().focus().select().keydown(function(e){9==(e.keyCode||e.which)&&(e.preventDefault(),s.label.blur(),l.focus())}))}function orderAddonGroups(){var e,i=jQuery;i("#addon-menu ul li").not(".ui-sortable-helper").find("input.id").each(function(n,t){(e=addonGroups[i(t).val()]).pricegroup.appendTo("#addon-pricing")})}function orderAddonPrices(e){var i=jQuery,n=addonGroups[e];i("#addon-list #addon-group-"+n.index+" li").not(".ui-sortable-helper").find("input.id").each(function(e,t){Pricelines.reorderAddon(i(t).val(),n.pricegroup)})}function readableFileSize(e){var i=new Array("bytes","KB","MB","GB"),n=1*e,t=0;if(0==n)return n;for(;n>1e3;)n/=1024,t++;return n.toFixed(2)+" "+i[t]}function addDetail(e){var i,n,t=jQuery,l=t("#details-menu"),o=t("#details-list"),a=new NestedMenu(detailsidx++,l,"details","Detail Name",e,{target:o});if(e&&e.options){n=t('<select name="details['+a.index+'][value]"></select>').appendTo(a.itemsElement),t("<option></option>").appendTo(n);for(i in e.options)t("<option>"+e.options[i].name+"</option>").appendTo(n);e&&e.value&&n.val(htmlentities(e.value))}else a.item=new NestedMenuContent(a.index,a.itemsElement,"details",e);e&&!e.add||(a.add=t('<input type="hidden" name="details['+a.index+'][new]" value="true" />').appendTo(a.element),l.dequeue().animate({scrollTop:l.attr("scrollHeight")-l.height()},200),a.label.click().focus().select(),a.item&&a.item.contents.keydown(function(e){9==(e.keyCode||e.which)&&(e.preventDefault(),t("#addDetail").focus())}))}function ImageUploads(e,i){function n(){t(".lightbox-dropzone li").length>0&&t(".lightbox-dropzone").sortable({opacity:.8})}var t=jQuery;Dropzone.autoDiscover=!1,t.template("image-preview-template",t("#lightbox-image-template"));new Dropzone("ul.lightbox-dropzone",{url:imgul_url+"&type="+i+"&parent="+e,maxFilesize:uploadLimit/1024/1024,autoDiscover:!1,parallelUploads:5,autoProcessQueue:!0,previewTemplate:t.tmpl("image-preview-template").html(),acceptedFiles:"image/*",init:function(){var e=this;t(".image-upload").on("click",function(){e.hiddenFileInput.click()}),e.on("error",function(e,i){t(".lightbox-dropzone li.dz-error").on("click",function(){t(this).fadeOut(300,function(){t(this).remove()})})}),e.on("success",function(e,i){t(e.previewElement).find(".imageid").attr("value",i.id)}),e.on("complete",function(e,i){n()})}});n(),t(".lightbox-dropzone li:not(.dz-upload-control)").each(function(){t(this).dblclick(function(){var e=t(this).attr("id")+"-details",i=t("#"+e),n=i.find("input[type=hidden]").val(),l=i.find("img"),o=i.find("input.imagetitle"),a=i.find("input.imagealt"),s=i.find("input.imagecropped"),r=t('<div class="image-details-editor"><div class="details-editor"><img class="thumb" width="96" height="96" /><div class="details"><p><label>'+IMAGE_DETAILS_TITLE_LABEL+': </label><input type="text" name="title" /></p><p><label>'+IMAGE_DETAILS_ALT_LABEL+': </label><input type="text" name="alt" /></p></div></div><div class="cropping"><p class="clear">'+IMAGE_DETAILS_CROP_LABEL+': <select name="cropimage"><option></option></select></p><div class="cropui"></div><br class="clear"/></div><input type="button" class="button-primary alignright" value="&nbsp;&nbsp;'+IMAGE_DETAILS_DONE+'&nbsp;&nbsp;" /></div>'),d=(r.find("img").attr("src",l.attr("src")),r.find("input[name=title]").val(o.val()).change(function(){o.val(d.val())})),c=r.find("input[name=alt]").val(a.val()).change(function(){a.val(c.val())}),u=(r.find("input[type=button]").click(function(){t.colorbox.close()}),r.find("div.cropping").hide()),p=r.find("div.cropui"),h=r.find("select[name=cropimage]").change(function(){if(""==h.val())return p.empty(),void t.colorbox.resize();var e=h.val().split(":"),i=s.filter("input[alt="+h.val()+"]").val().split(",");p.empty().scaleCrop({imgsrc:"?siid="+n,target:{width:parseInt(e[0],10),height:parseInt(e[1],10)},init:{x:parseInt(i[0],10),y:parseInt(i[1],10),s:new Number(i[2])}}).ready(function(){t.colorbox.resize({innerWidth:parseInt(e[0],10)+125})}).bind("change.scalecrop",function(e,i){i.s||(i.s=1),i&&s.filter("input[alt="+h.val()+"]").val(i.x+","+i.y+","+i.s)})});s.size()>0&&(s.each(function(e,i){var n=t(i).attr("alt");t('<option value="'+n+'">'+(e+1)+": "+n.replace(":","&times;")+"</option>").appendTo(h)}),u.show()),t.colorbox({title:IMAGE_DETAILS_TEXT,html:r})}),function(e){e.hide(),e.parent().hover(function(){e.show()},function(){e.hide()}),e.click(function(){if(confirm(DELETE_IMAGE_WARNING)){var i="<"==e.val().substr(0,1)?e.find("input[name=ieisstupid]").val():e.val(),n=t("#deleteImages"),l=n.val();n.val(""==l?i:l+","+i),t("#confirm-delete-images").show(),e.parent().fadeOut(500,function(){t(this).remove()})}})}(t(this).find("button.delete"))})}function FileUploader(e){var i=jQuery,n=this;this.priceline=!1,i.template("filechooser-upload-template",i("#filechooser-upload-template")),this.dropzone=new Dropzone(e,{url:fileupload_url,autoDiscover:!1,uploadMultiple:!1,autoQueue:!0,autoProcessQueue:!0,chunking:!0,forceChunking:!0,chunkSize:chunkSize,maxFilesize:4096,parallelChunkUploads:!1,retryChunks:!0,parallelConnectionsLimit:uploadMaxConnections,previewTemplate:i.tmpl("filechooser-upload-template").html(),init:function(){var e=this;e.startTime=!1,e.samples=[],e.samplesLimit=5,e.connections=0,i(".filechooser-upload").on("mousedown",function(){e.hiddenFileInput.click(),i(e.previewsContainer).empty()}),e.on("addedfile",function(n){i.colorbox.hide(),e.processQueue(),i(e.previewsContainer).find(".icon.shoppui-file").addClass(n.type.replace("/"," "))}),e.on("success",function(t){var l=JSON.parse(t.xhr.response);l.id&&i("<input>").attr({type:"hidden",name:"price["+n.priceline+"][download]",value:l.id}).appendTo(i(e.previewsContainer))}),e.options.params=function(e,i,n){if(n)return{dzuuid:n.file.upload.uuid,dzchunkindex:n.index,dztotalfilesize:n.file.size,dzchunksize:n.chunkSize,dztotalchunkcount:n.file.upload.totalChunkCount,dzchunkbyteoffset:n.end}},e.uploadFiles=function(i){var n=this;this._transformFiles(i,function(t){if(i[0].upload.chunked){var l=i[0],o=t[0],a=0;l.upload.chunks=[];var s=function(){for(var t=0;void 0!==l.upload.chunks[t];)t++;if(!(t>=l.upload.totalChunkCount)){a++;var s=t*n.options.chunkSize,r=Math.min(s+n.options.chunkSize,l.size);!1===e.startTime&&(e.startTime=(new Date).getTime());var d=(new Date).getTime();if(e.samples.length<=e.samplesLimit&&l.upload.bytesSent>0&&e.samples.push(l.upload.bytesSent/((d-e.startTime)/1e3)),e.samples.length==e.samplesLimit){var c=e.samples.reduce(function(e,i){return e+i})/e.samples.length;e.options.chunkSize=Math.min(Math.floor(c),uploadLimit-1024),l.upload.totalChunkCount=Math.ceil((l.size-l.upload.bytesSent)/e.options.chunkSize)+e.samplesLimit;var u=Math.floor(c/e.options.chunkSize);u>1&&(e.options.parallelChunkUploads=!0,e.options.parallelConnectionsLimit=Math.min(u,e.options.parallelConnectionsLimit))}t>0&&(s=l.upload.chunks[t-1].end,r=Math.min(s+e.options.chunkSize,l.size));var p={name:n._getParamName(0),data:o.webkitSlice?o.webkitSlice(s,r):o.slice(s,r),filename:l.upload.filename,chunkIndex:t};l.upload.chunks[t]={file:l,index:t,dataBlock:p,status:Dropzone.UPLOADING,progress:0,start:s,end:r,chunkSize:e.options.chunkSize,retries:0},n._uploadData(i,[p])}},r=function(){for(e.connections>0&&e.connections--;e.connections<e.options.parallelConnectionsLimit;e.connections++)s()};if(l.upload.finishedChunkUpload=function(t){var o=!0;t.status=Dropzone.SUCCESS,t.dataBlock=null;for(var a=0;a<l.upload.totalChunkCount;a++){if(void 0===l.upload.chunks[a])return e.options.parallelChunkUploads?r():s();l.upload.chunks[a].status!==Dropzone.SUCCESS&&(o=!1)}o&&n.options.chunksUploaded(l,function(){n._finished(i,"",null)})},n.options.parallelChunkUploads)for(var d=0;d<l.upload.totalChunkCount;d++)s();else s()}else{for(var c=[],u=0;u<i.length;u++)c[u]={name:n._getParamName(u),data:t[u],filename:i[u].upload.filename};n._uploadData(i,c)}})}}})}function SlugEditor(e,i){var n=jQuery,t=n("#edit-slug-buttons"),l=t.find(".edit"),o=t.find(".view"),a=n("#editor-slug-buttons"),s=a.find(".save"),r=a.find(".cancel"),d=n("#editable-slug-full");this.permalink=function(){var l,c=0,u=n("#editable-slug"),p=u.html(),h=n("#slug_input"),f=h.html(),m=d.html();for(t.hide(),a.show(),s.unbind("click").click(function(){var l=u.children("input").val(),s=n("#title").val();n.post(editslug_url+"&action=shopp_edit_slug",{id:e,type:i,slug:l,title:s},function(e){u.html(p),-1!=e&&(u.html(e),d.html(e),h.val(e)),o.attr("href",canonurl+d.html()),a.hide(),t.show()},"text")}),r.unbind("click").click(function(){u.html(p),a.hide(),t.show(),h.attr("value",f)}),l=0;l<m.length;++l)"%"==m.charAt(l)&&c++;slug_value=c>m.length/4?"":m,u.html('<input type="text" id="new-post-slug" value="'+slug_value+'" />').children("input").keypress(function(e){var i=e.which;13!=i&&27!=i||e.preventDefault(),13==i&&s.click(),27==i&&r.click(),h.val(this.value)}).focus()},l.click(this.permalink)}jQuery.fn.FileChooser=function(e,i){var n=jQuery,t=this,l=n("#filechooser"),o=l.find(".fileimport"),a=l.find(".status"),s=n("#attach-file"),r=n("#download_path-"+e),d=n("#download_file-"+e),c=n("#file-"+e);t.line=e,t.status=i,l.unbind("change").on("change",".fileimport",function(e){a.attr("class","status").addClass("shoppui-spinner shoppui-spinfx shoppui-spinfx-steps8"),n.ajax({url:fileverify_url+"&action=shopp_verify_file&t=download",type:"POST",data:"url="+o.val(),timeout:1e4,dataType:"text",success:function(e){if(a.attr("class","status"),"OK"==e)return a.addClass("shoppui-ok-sign");"NULL"==e&&a.attr("title",FILE_NOT_FOUND_TEXT),"ISDIR"==e&&a.attr("title",FILE_ISDIR_TEXT),"READ"==e&&a.attr("title",FILE_NOT_READ_TEXT),a.addClass("shoppui-warning-sign")}})}),o.unbind("keydown").unbind("keypress").suggest(sugg_url+"&action=shopp_storage_suggestions&t=download",{delay:500,minchars:3,multiple:!1,onSelect:function(){o.trigger("change")}}),n(this).click(function(){a.attr("class","status"),fileUploads.dropzone.previewsContainer=c[0],fileUploads.priceline=t.line,s.unbind("click").click(function(){n.colorbox.hide();var i=!1,t=!1,l=0,a=o.val(),s=function(e){if(!e.name)return $this.attr("class","");r.val(e.path),d.val(e.name),o.val("").attr("class","fileimport")},u=function(e){e||(e=FILE_UNKNOWN_IMPORT_ERROR),c.attr("class","error").html("<small>"+e+"</small>")},p=function(){var e=f.importProgress,n=f.importFile;if(void 0===n)return h();if(!n.path)return u();if(n.error)return u(n.error);if(n.stored)return s(n);if(void 0===e&&(e=0),savepath=n.path.split("/"),i=savepath[savepath.length-1],t||(m.addClass(n.mime.replace("/"," ")),v.text(n.name),g.text(readableFileSize(n.size)),k.css("opacity",1),t=!0),0===e&&l++>60)return u();var o=Math.floor(100*e);b[0].style.width=o+"%",o>=100?k.fadeOut(500,function(){s(n)}):h()},h=function(){setTimeout(p,100)};n.template("filechooser-upload-template",n("#filechooser-upload-template")),c.attr("class","").html(n.tmpl("filechooser-upload-template").html()).append('<iframe id="import-file-'+e+'" width="0" height="0" src="'+fileimport_url+"&action=shopp_import_file&url="+a+'"></iframe>');var f=n("#import-file-"+e)[0].contentWindow,m=c.find(".icon"),v=c.find(".dz-filename"),g=c.find(".dz-size"),k=c.find(".dz-progress"),b=c.find(".dz-upload");h()})}),n(this).colorbox({title:"File Selector",innerWidth:"360",innerHeight:"140",inline:!0,href:l})};

shopp/trunk/core/ui/behaviors/shopp.js

@@ -205 +205 @@
  **/
 function quickSelects (e) {
-    var target = jQuery(e).size() == 0 ? document : e;
+    var target = jQuery(e).length == 0 ? document : e;
     jQuery(target).on('mouseup.select', 'input.selectall', function () { this.select(); });
 }
 
 function moneyInputs (e) {
-    var target = jQuery(e).size() == 0 ? document : e;
+    var target = jQuery(e).length == 0 ? document : e;
     jQuery(document).on('change', 'input.money', function () { this.value = asMoney(this.value); });
 }

shopp/trunk/core/ui/behaviors/shopp.min.js

@@ -1 @@
-function jqnc(){return jQuery.noConflict()}function copyOf(e){var r,n=new Object;for(r in e)n[r]=e[r];return n}function getCurrencyFormat(e){if(e&&e.currency)return e;var r={cpos:!0,currency:"$",precision:2,decimals:".",thousands:",",grouping:[3]},n={cp:"cpos",c:"currency",p:"precision",d:"decimals",t:"thousands",g:"grouping"},t=r;return jQuery.each(n,function(e,r){void 0!==$s[e]&&("p"==e?t[r]=parseInt($s[e],10):"cp"==e?t[r]=Boolean($s[e]):"g"==e?t[r]=$s[e].split(","):t[r]=$s[e])}),t}function asMoney(e,r){return r=getCurrencyFormat(r),e=formatNumber(e,r),r.cpos?r.currency+e:e+r.currency}function asPercent(e,r,n,t){return r=getCurrencyFormat(r),r.precision=n?n:1,formatNumber(e,r,t).replace(/0+$/,"").replace(new RegExp("\\"+r.decimals+"$"),"")+"%"}function formatNumber(e,r,n){r=getCurrencyFormat(r),e=asNumber(e);var t,i=fraction=0,u=!1,c="",o=[],a=e.toFixed(r.precision).toString().split("."),s=r.grouping?r.grouping:[3];for(e="",i=a[0],a[1]&&(fraction=a[1]),s=s.indexOf(",")>-1?s.split(","):[s],t=0,lg=s.length-1;i.length>s[Math.min(t,lg)]&&""!=s[Math.min(t,lg)];)u=i.length-s[Math.min(t++,lg)],c=i,i=c.substr(0,u),o.unshift(c.substr(u));return i&&o.unshift(i),e=o.join(r.thousands),""==e&&(e=0),fraction=n?new Number("0."+fraction).toString().substr(2,r.precision):fraction,fraction=!n||n&&fraction.length>0?r.decimals+fraction:"",r.precision>0&&(e+=fraction),e}function asNumber(e,r){return e?(r=getCurrencyFormat(r),e instanceof Number?new Number(e.toFixed(r.precision)):"number"==typeof e?new Number(e.toFixed(r.precision)):(e=e.toString().replace(r.currency,""),e=e.toString().replace(new RegExp(/(\D\.|[^\d\,\.\-])/g),""),""!=r.thousands&&(e=e.toString().replace(new RegExp("\\"+r.thousands,"g"),"")),r.precision>0&&(e=e.toString().replace(new RegExp("\\"+r.decimals,"g"),".")),isNaN(new Number(e))&&(e=e.replace(new RegExp(/\./g),"").replace(new RegExp(/\,/),".")),new Number(e))):0}function CallbackRegistry(){this.callbacks=new Array,this.register=function(e,r){this.callbacks[e]=r},this.call=function(e,r,n,t){this.callbacks[e](r,n,t)},this.get=function(e){return this.callbacks[e]}}function quickSelects(e){var r=0==jQuery(e).size()?document:e;jQuery(r).on("mouseup.select","input.selectall",function(){this.select()})}function moneyInputs(e){0==jQuery(e).size()?document:e;jQuery(document).on("change","input.money",function(){this.value=asMoney(this.value)})}function htmlentities(e){return e?e=e.replace(new RegExp(/&#(\d+);/g),function(){return String.fromCharCode(RegExp.$1)}):""}jQuery.ua={chrome:!1,mozilla:!1,opera:!1,msie:!1,safari:!1},jQuery.each(jQuery.ua,function(e,r){var n=navigator.userAgent;jQuery.ua[e]=!!new RegExp(e,"i").test(n),jQuery.ua.mozilla&&"mozilla"==e&&(jQuery.ua.mozilla=!!new RegExp("firefox","i").test(n)),jQuery.ua.chrome&&"safari"==e&&(jQuery.ua.safari=!1)}),Array.indexOf||(Array.prototype.indexOf=function(e){for(var r=0;r<this.length;r++)if(this[r]==e)return r;return-1}),Number.prototype.roundFixed||(Number.prototype.roundFixed=function(e){var r=Math.pow(10,e||0);return String(Math.round(this*r)/r)}),jQuery.fn.fadeRemove=function(e,r){var n=jQuery(this);return n.fadeOut(e,function(){n.remove(),r&&r()}),this},jQuery.fn.hoverClass=function(){var e=jQuery(this);return e.hover(function(){e.addClass("hover")},function(){e.removeClass("hover")}),this},jQuery.fn.clickSubmit=function(){var e=jQuery(this);return e.click(function(){jQuery(this).closest("form").submit()}),this},jQuery.fn.setDisabled=function(e){var r=jQuery(this);return r.each(function(){e?r.attr("disabled",!0).addClass("disabled"):r.attr("disabled",!1).removeClass("disabled")}),this},jQuery.parseJSON=function(data){if("undefined"==typeof JSON||"function"!=typeof JSON.parse)return eval("("+data+")");try{return JSON.parse(data)}catch(e){return!1}},jQuery.getQueryVar=function(e,r){e=e.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var n=new RegExp("[\\?&]"+e+"=([^&#]*)"),t=n.exec(r);return null==t?"":decodeURIComponent(t[1].replace(/\+/g," "))},jQuery(document).ready(function(e){e("input.currency, input.money").change(function(){this.value=asMoney(this.value)}).change(),e(".click-submit").clickSubmit(),quickSelects()});
+function jqnc(){return jQuery.noConflict()}function copyOf(e){var r,n=new Object;for(r in e)n[r]=e[r];return n}function getCurrencyFormat(e){if(e&&e.currency)return e;var r={cpos:!0,currency:"$",precision:2,decimals:".",thousands:",",grouping:[3]};return jQuery.each({cp:"cpos",c:"currency",p:"precision",d:"decimals",t:"thousands",g:"grouping"},function(e,n){void 0!==$s[e]&&(r[n]="p"==e?parseInt($s[e],10):"cp"==e?Boolean($s[e]):"g"==e?$s[e].split(","):$s[e])}),r}function asMoney(e,r){return r=getCurrencyFormat(r),e=formatNumber(e,r),r.cpos?r.currency+e:e+r.currency}function asPercent(e,r,n,t){return r=getCurrencyFormat(r),r.precision=n||1,formatNumber(e,r,t).replace(/0+$/,"").replace(new RegExp("\\"+r.decimals+"$"),"")+"%"}function formatNumber(e,r,n){r=getCurrencyFormat(r),e=asNumber(e);var t,i=fraction=0,u=!1,c="",o=[],a=e.toFixed(r.precision).toString().split("."),s=r.grouping?r.grouping:[3];for(e="",i=a[0],a[1]&&(fraction=a[1]),s=s.indexOf(",")>-1?s.split(","):[s],t=0,lg=s.length-1;i.length>s[Math.min(t,lg)]&&""!=s[Math.min(t,lg)];)u=i.length-s[Math.min(t++,lg)],i=(c=i).substr(0,u),o.unshift(c.substr(u));return i&&o.unshift(i),""==(e=o.join(r.thousands))&&(e=0),fraction=n?new Number("0."+fraction).toString().substr(2,r.precision):fraction,fraction=!n||n&&fraction.length>0?r.decimals+fraction:"",r.precision>0&&(e+=fraction),e}function asNumber(e,r){return e?(r=getCurrencyFormat(r),e instanceof Number?new Number(e.toFixed(r.precision)):"number"==typeof e?new Number(e.toFixed(r.precision)):(e=e.toString().replace(r.currency,""),e=e.toString().replace(new RegExp(/(\D\.|[^\d\,\.\-])/g),""),""!=r.thousands&&(e=e.toString().replace(new RegExp("\\"+r.thousands,"g"),"")),r.precision>0&&(e=e.toString().replace(new RegExp("\\"+r.decimals,"g"),".")),isNaN(new Number(e))&&(e=e.replace(new RegExp(/\./g),"").replace(new RegExp(/\,/),".")),new Number(e))):0}function CallbackRegistry(){this.callbacks=new Array,this.register=function(e,r){this.callbacks[e]=r},this.call=function(e,r,n,t){this.callbacks[e](r,n,t)},this.get=function(e){return this.callbacks[e]}}function quickSelects(e){var r=0==jQuery(e).length?document:e;jQuery(r).on("mouseup.select","input.selectall",function(){this.select()})}function moneyInputs(e){0==jQuery(e).size()&&document;jQuery(document).on("change","input.money",function(){this.value=asMoney(this.value)})}function htmlentities(e){return e?e=e.replace(new RegExp(/&#(\d+);/g),function(){return String.fromCharCode(RegExp.$1)}):""}jQuery.ua={chrome:!1,mozilla:!1,opera:!1,msie:!1,safari:!1},jQuery.each(jQuery.ua,function(e,r){var n=navigator.userAgent;jQuery.ua[e]=!!new RegExp(e,"i").test(n),jQuery.ua.mozilla&&"mozilla"==e&&(jQuery.ua.mozilla=!!new RegExp("firefox","i").test(n)),jQuery.ua.chrome&&"safari"==e&&(jQuery.ua.safari=!1)}),Array.indexOf||(Array.prototype.indexOf=function(e){for(var r=0;r<this.length;r++)if(this[r]==e)return r;return-1}),Number.prototype.roundFixed||(Number.prototype.roundFixed=function(e){var r=Math.pow(10,e||0);return String(Math.round(this*r)/r)}),jQuery.fn.fadeRemove=function(e,r){var n=jQuery(this);return n.fadeOut(e,function(){n.remove(),r&&r()}),this},jQuery.fn.hoverClass=function(){var e=jQuery(this);return e.hover(function(){e.addClass("hover")},function(){e.removeClass("hover")}),this},jQuery.fn.clickSubmit=function(){return jQuery(this).click(function(){jQuery(this).closest("form").submit()}),this},jQuery.fn.setDisabled=function(e){var r=jQuery(this);return r.each(function(){e?r.attr("disabled",!0).addClass("disabled"):r.attr("disabled",!1).removeClass("disabled")}),this},jQuery.parseJSON=function(data){if("undefined"==typeof JSON||"function"!=typeof JSON.parse)return eval("("+data+")");try{return JSON.parse(data)}catch(e){return!1}},jQuery.getQueryVar=function(e,r){e=e.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var n=new RegExp("[\\?&]"+e+"=([^&#]*)").exec(r);return null==n?"":decodeURIComponent(n[1].replace(/\+/g," "))},jQuery(document).ready(function(e){e("input.currency, input.money").change(function(){this.value=asMoney(this.value)}).change(),e(".click-submit").clickSubmit(),quickSelects()});

shopp/trunk/core/ui/behaviors/suggest.js

@@ -39 +39 @@
         resetPosition();
         $(window)
-            .load(resetPosition)        // just in case user is changing size of page while loading
+            .on('load', resetPosition)      // just in case user is changing size of page while loading
             .resize(resetPosition);
 

shopp/trunk/core/ui/behaviors/suggest.min.js

@@ -1 @@
-!function(e){e.suggest=function(t,l){function s(){var e=d.offset();v.css({top:e.top+d.outerHeight()+l.yoffset+"px",left:e.left+"px"})}function a(e){if(/27$|38$|40$/.test(e.keyCode)&&v.is(":visible")||/^13$|^9$/.test(e.keyCode)&&f())switch(e.preventDefault&&e.preventDefault(),e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0,e.returnValue=!1,e.keyCode){case 38:m();break;case 40:p();break;case 9:case 13:h();break;case 27:v.hide()}else g.val().length!=S&&(C&&clearTimeout(C),C=setTimeout(i,l.delay),S=g.val().length)}function i(){var t,s,a=e.trim(g.val());0==a.length&&l.autoSuggest&&(a=l.autoSuggest),l.multiple&&(t=a.lastIndexOf(l.multipleSep),t!=-1&&(a=e.trim(a.substr(t+l.multipleSep.length)))),a.length>=l.minchars?(cached=u(a),cached?c(cached.items):e.get(l.source,{q:a},function(t){v.hide(),s="json"==l.format?e.parseJSON(t):o(t,a),c(s),r(a,s,t.length)})):v.hide()}function n(){var e=!1;e&&clearTimeout(e),e=setTimeout(i,3e3),g.blur(function(){clearTimeout(e)})}function u(e){var t;for(t=0;t<b.length;t++)if(b[t].q==e)return b.unshift(b.splice(t,1)[0]),b[0];return!1}function r(e,t,s){for(var a;b.length&&y+s>l.maxCacheSize;)a=b.pop(),y-=a.size;b.push({q:e,size:s,items:t}),y+=s}function c(t){var a,i="";if(!t)return void(l.label&&v.html("<li>"+l.label+"</li>").show());if(!t.length)return void(l.label&&v.html("<li>"+l.label+"</li>").show());if(s(),"json"==l.format)for(a=0;a<t.length;a++)i+='<li alt="'+t[a].id+'">'+t[a].name+"</li>";else for(a=0;a<t.length;a++)i+="<li>"+t[a]+"</li>";v.html(i).show(),v.children("li").mouseover(function(){v.children("li").removeClass(l.selectClass),e(this).addClass(l.selectClass)}).click(function(e){e.preventDefault(),e.stopPropagation(),h()}),l.autoSelect&&p()}function o(t,s){var a,i,n=[],u=t.split(l.delimiter);for(a=0;a<u.length;a++)i=e.trim(u[a]),i&&(i=i.replace(new RegExp(s,"ig"),function(e){return'<span class="'+l.matchClass+'">'+e+"</span>"}),n[n.length]=i);return n}function f(){var e;return!!v.is(":visible")&&(e=v.children("li."+l.selectClass),e.length||(e=!1),e)}function h(){$currentResult=f(),$currentResult&&(l.multiple?(g.val().indexOf(l.multipleSep)!=-1?$currentVal=g.val().substr(0,g.val().lastIndexOf(l.multipleSep)+l.multipleSep.length):$currentVal="",g.val($currentVal+$currentResult.text()+l.multipleSep),g.focus()):"alt"==l.value?g.val($currentResult.attr("alt")):g.val($currentResult.text()).attr("alt",$currentResult.attr("alt")),v.hide(),l.onSelect&&l.onSelect.apply(g[0]))}function p(){$currentResult=f(),$currentResult?$currentResult.removeClass(l.selectClass).next().addClass(l.selectClass):v.children("li:first-child").addClass(l.selectClass)}function m(){var e=f();e?e.removeClass(l.selectClass).prev().addClass(l.selectClass):v.children("li:last-child").addClass(l.selectClass)}var d,g,v,C,S,b,y;if(d=e(t),input=d.is("input")?d:d.find("input"),g=e(input).attr("autocomplete","off"),v=e("<ul/>").appendTo("body"),C=!1,S=0,b=[],y=0,v.addClass(l.resultsClass).appendTo("body"),s(),e(window).load(s).resize(s),g.blur(function(){setTimeout(function(){v.hide()},200)}),l.showOnFocus&&g.focus(function(){s(),c(),l.autoSuggest&&n()}),e.ua.msie)try{v.bgiframe()}catch(e){}e.ua.mozilla?g.keypress(a):g.keydown(a)},e.fn.suggest=function(t,l){if(t)return l=l||{},l.multiple=l.multiple||!1,l.multipleSep=l.multipleSep||", ",l.showOnFocus=l.showOnFocus||!1,l.source=t,l.yoffset=l.yoffset||0,l.delay=l.delay||100,l.autoDelay=l.autoDelay||3e3,l.autoQuery=l.autoQuery||!1,l.resultsClass=l.resultsClass||"suggest-results",l.selectClass=l.selectClass||"suggest-select",l.matchClass=l.matchClass||"suggest-match",l.minchars=l.minchars||2,l.delimiter=l.delimiter||"\n",l.format=l.format||"string",l.label=l.label||!1,l.value=l.value||"text",l.onSelect=l.onSelect||!1,l.autoSelect=l.autoSelect||!1,l.maxCacheSize=l.maxCacheSize||65536,this.each(function(){new e.suggest(this,l)}),this}}(jQuery);
+!function(e){e.suggest=function(t,l){function s(){var e=o.offset();h.css({top:e.top+o.outerHeight()+l.yoffset+"px",left:e.left+"px"})}function a(e){if(/27$|38$|40$/.test(e.keyCode)&&h.is(":visible")||/^13$|^9$/.test(e.keyCode)&&u())switch(e.preventDefault&&e.preventDefault(),e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0,e.returnValue=!1,e.keyCode){case 38:!function(){var e=u();e?e.removeClass(l.selectClass).prev().addClass(l.selectClass):h.children("li:last-child").addClass(l.selectClass)}();break;case 40:c();break;case 9:case 13:r();break;case 27:h.hide()}else f.val().length!=m&&(p&&clearTimeout(p),p=setTimeout(i,l.delay),m=f.val().length)}function i(){var t,s,a=e.trim(f.val());0==a.length&&l.autoSuggest&&(a=l.autoSuggest),l.multiple&&-1!=(t=a.lastIndexOf(l.multipleSep))&&(a=e.trim(a.substr(t+l.multipleSep.length))),a.length>=l.minchars?(cached=function(e){var t;for(t=0;t<d.length;t++)if(d[t].q==e)return d.unshift(d.splice(t,1)[0]),d[0];return!1}(a),cached?n(cached.items):e.get(l.source,{q:a},function(t){h.hide(),n(s="json"==l.format?e.parseJSON(t):function(t,s){var a,i,n=[],u=t.split(l.delimiter);for(a=0;a<u.length;a++)(i=e.trim(u[a]))&&(i=i.replace(new RegExp(s,"ig"),function(e){return'<span class="'+l.matchClass+'">'+e+"</span>"}),n[n.length]=i);return n}(t,a)),function(e,t,s){var a;for(;d.length&&g+s>l.maxCacheSize;)a=d.pop(),g-=a.size;d.push({q:e,size:s,items:t}),g+=s}(a,s,t.length)})):h.hide()}function n(t){var a,i="";if(t)if(t.length){if(s(),"json"==l.format)for(a=0;a<t.length;a++)i+='<li alt="'+t[a].id+'">'+t[a].name+"</li>";else for(a=0;a<t.length;a++)i+="<li>"+t[a]+"</li>";h.html(i).show(),h.children("li").mouseover(function(){h.children("li").removeClass(l.selectClass),e(this).addClass(l.selectClass)}).click(function(e){e.preventDefault(),e.stopPropagation(),r()}),l.autoSelect&&c()}else l.label&&h.html("<li>"+l.label+"</li>").show();else l.label&&h.html("<li>"+l.label+"</li>").show()}function u(){var e;return!!h.is(":visible")&&((e=h.children("li."+l.selectClass)).length||(e=!1),e)}function r(){$currentResult=u(),$currentResult&&(l.multiple?(-1!=f.val().indexOf(l.multipleSep)?$currentVal=f.val().substr(0,f.val().lastIndexOf(l.multipleSep)+l.multipleSep.length):$currentVal="",f.val($currentVal+$currentResult.text()+l.multipleSep),f.focus()):"alt"==l.value?f.val($currentResult.attr("alt")):f.val($currentResult.text()).attr("alt",$currentResult.attr("alt")),h.hide(),l.onSelect&&l.onSelect.apply(f[0]))}function c(){$currentResult=u(),$currentResult?$currentResult.removeClass(l.selectClass).next().addClass(l.selectClass):h.children("li:first-child").addClass(l.selectClass)}var o,f,h,p,m,d,g;if(o=e(t),input=o.is("input")?o:o.find("input"),f=e(input).attr("autocomplete","off"),h=e("<ul/>").appendTo("body"),p=!1,m=0,d=[],g=0,h.addClass(l.resultsClass).appendTo("body"),s(),e(window).load(s).resize(s),f.blur(function(){setTimeout(function(){h.hide()},200)}),l.showOnFocus&&f.focus(function(){s(),n(),l.autoSuggest&&function(){var e=!1;e&&clearTimeout(e),e=setTimeout(i,3e3),f.blur(function(){clearTimeout(e)})}()}),e.ua.msie)try{h.bgiframe()}catch(e){}e.ua.mozilla?f.keypress(a):f.keydown(a)},e.fn.suggest=function(t,l){if(t)return l=l||{},l.multiple=l.multiple||!1,l.multipleSep=l.multipleSep||", ",l.showOnFocus=l.showOnFocus||!1,l.source=t,l.yoffset=l.yoffset||0,l.delay=l.delay||100,l.autoDelay=l.autoDelay||3e3,l.autoQuery=l.autoQuery||!1,l.resultsClass=l.resultsClass||"suggest-results",l.selectClass=l.selectClass||"suggest-select",l.matchClass=l.matchClass||"suggest-match",l.minchars=l.minchars||2,l.delimiter=l.delimiter||"\n",l.format=l.format||"string",l.label=l.label||!1,l.value=l.value||"text",l.onSelect=l.onSelect||!1,l.autoSelect=l.autoSelect||!1,l.maxCacheSize=l.maxCacheSize||65536,this.each(function(){new e.suggest(this,l)}),this}}(jQuery);

shopp/trunk/core/ui/categories/category.js

@@ -7 +7 @@
     pricingidx = 1,
     pricelevelsidx = 1,
-    fileUploader = false,
     changes = false,
     saving = false,
-    flashUploader = false,
     template = true;
 
@@ -16 +14 @@
     var $=jQuery,
         editslug = new SlugEditor(category,'category'),
-        imageUploads = new ImageUploads($('#image-category-id').val(),'category')
+        imageUploads = new ImageUploads($('#image-category-id').val(), 'category')
         titlePrompt = $('#title-prompt-text'),
 

shopp/trunk/core/ui/categories/category.min.js

@@ -1 @@
-var Pricelines=new Pricelines,productOptions=new Array,optionMenus=new Array,detailsidx=1,variationsidx=1,optionsidx=1,pricingidx=1,pricelevelsidx=1,fileUploader=!1,changes=!1,saving=!1,flashUploader=!1,template=!0;jQuery(document).ready(function(){function e(e){var t=n("#pricerange-menu"),i=pricelevelsidx++,a=new NestedMenu(i,t,"priceranges","",e,(!1),{axis:"y",scroll:!1});n(a.label).change(function(){this.value=asMoney(this.value)}).change()}function t(e){var t=n("#details-menu"),i=n("#details-list"),a=n("#addDetailOption"),s=detailsidx,o=new NestedMenu(s,t,"specs",NEW_DETAIL_DEFAULT,e,{target:i,type:"list"});o.items=new Array,o.addOption=function(e){var t=new NestedMenuOption(o.index,o.itemsElement,o.dataname,NEW_OPTION_DEFAULT,e,(!0));o.items.push(t)};var c=n('<li class="setting"></li>').appendTo(o.itemsElement),l=n('<select name="specs['+o.index+'][facetedmenu]"></select>').appendTo(c);n('<option value="disabled">'+FACETED_DISABLED+"</option>").appendTo(l),n('<option value="auto">'+FACETED_AUTO+"</option>").appendTo(l),n('<option value="ranges">'+FACETED_RANGES+"</option>").appendTo(l),n('<option value="custom">'+FACETED_CUSTOM+"</option>").appendTo(l),e&&e.facetedmenu&&l.val(e.facetedmenu),l.change(function(){"disabled"==n(this).val()||"auto"==n(this).val()?(n(a).hide(),n(o.itemsElement).find("li.option").hide()):(n(a).show(),n(o.itemsElement).find("li.option").show())}).change(),e&&e.options&&n.each(e.options,function(e,t){o.addOption(t)}),n(o.itemsElement).sortable({axis:"y",items:"li.option",scroll:!1}),o.element.unbind("click",o.click),o.element.click(function(){o.selected(),n(a).unbind("click").click(o.addOption),n(l).change()}),detailsidx++}function i(){n("#workflow").change(function(){setting=n(this).val(),request.page=adminpage,request.id=category,request.id||(request.id="new"),"new"==setting&&(request.id="new",request.next=setting),"close"==setting&&delete request.id,"previous"==setting&&n.each(worklist,function(e,t){t.id==category&&(worklist[e-1]?request.next=worklist[e-1].id:delete request.id)}),"next"==setting&&n.each(worklist,function(e,t){t.id==category&&(worklist[e+1]?request.next=worklist[e+1].id:delete request.id)})}).change()}var n=jQuery;new SlugEditor(category,"category"),new ImageUploads(n("#image-category-id").val(),"category");titlePrompt=n("#title-prompt-text"),title=n("#title").bind("focus keydown",function(){titlePrompt.hide()}).blur(function(){""==title.val()?titlePrompt.show():titlePrompt.hide()}),postboxes.add_postbox_toggles("shopp_page_shopp-categories"),n(".if-js-closed").removeClass("if-js-closed").addClass("closed"),n(".postbox a.help").click(function(){return n(this).colorbox({iframe:!0,open:!0,innerWidth:768,innerHeight:480,scrolling:!1}),!1}),i(),n("#category").submit(function(){return""==title.val()?(alert(ENTER_CATEGORY_NAME),!1):(this.action=this.action.substr(0,this.action.indexOf("?"))+"?"+n.param(request),!0)}),n("#templates, #details-template, #details-facetedmenu, #variations-template, #variations-pricing, #price-ranges").hide(),n("#spectemplates-setting").change(function(){this.checked?n("#templates, #details-template").show():n("#details-template").hide(),n("#spectemplates-setting").attr("checked")||n("#variations-setting").attr("checked")||n("#templates").hide()}).change(),n("#faceted-setting").change(function(){this.checked?(n("#details-menu").removeClass("options").addClass("menu"),n("#details-facetedmenu, #price-ranges").show()):(n("#details-menu").removeClass("menu").addClass("options"),n("#details-facetedmenu, #price-ranges").hide())}).change(),details&&n.each(details,function(e,i){t(i)}),n("#addPriceLevel").click(function(){e()}),n("#addDetail").click(function(){t()}),n("#variations-setting").bind("toggleui",function(){this.checked?n("#templates, #variations-template, #variations-pricing").show():n("#variations-template, #variations-pricing").hide(),n("#spectemplates-setting").attr("checked")||n("#variations-setting").attr("checked")||n("#templates").hide()}).click(function(){n(this).trigger("toggleui")}).trigger("toggleui"),options&&loadVariations(options.v?options.v:options,prices),n("#addVariationMenu").click(function(){addVariationOptionsMenu()}),n("#pricerange-facetedmenu").change(function(){"custom"==n(this).val()?n("#pricerange-menu, #addPriceLevel").show():n("#pricerange-menu, #addPriceLevel").hide()}).change(),priceranges&&n.each(priceranges,function(t,i){e(i)}),category||n("#title").focus()});
+var Pricelines=new Pricelines,productOptions=new Array,optionMenus=new Array,detailsidx=1,variationsidx=1,optionsidx=1,pricingidx=1,pricelevelsidx=1,changes=!1,saving=!1,template=!0;jQuery(document).ready(function(){function e(e){var t=i("#pricerange-menu"),n=pricelevelsidx++,a=new NestedMenu(n,t,"priceranges","",e,!1,{axis:"y",scroll:!1});i(a.label).change(function(){this.value=asMoney(this.value)}).change()}function t(e){var t=i("#details-menu"),n=i("#details-list"),a=i("#addDetailOption"),s=detailsidx,o=new NestedMenu(s,t,"specs",NEW_DETAIL_DEFAULT,e,{target:n,type:"list"});o.items=new Array,o.addOption=function(e){var t=new NestedMenuOption(o.index,o.itemsElement,o.dataname,NEW_OPTION_DEFAULT,e,!0);o.items.push(t)};var c=i('<li class="setting"></li>').appendTo(o.itemsElement),l=i('<select name="specs['+o.index+'][facetedmenu]"></select>').appendTo(c);i('<option value="disabled">'+FACETED_DISABLED+"</option>").appendTo(l),i('<option value="auto">'+FACETED_AUTO+"</option>").appendTo(l),i('<option value="ranges">'+FACETED_RANGES+"</option>").appendTo(l),i('<option value="custom">'+FACETED_CUSTOM+"</option>").appendTo(l),e&&e.facetedmenu&&l.val(e.facetedmenu),l.change(function(){"disabled"==i(this).val()||"auto"==i(this).val()?(i(a).hide(),i(o.itemsElement).find("li.option").hide()):(i(a).show(),i(o.itemsElement).find("li.option").show())}).change(),e&&e.options&&i.each(e.options,function(e,t){o.addOption(t)}),i(o.itemsElement).sortable({axis:"y",items:"li.option",scroll:!1}),o.element.unbind("click",o.click),o.element.click(function(){o.selected(),i(a).unbind("click").click(o.addOption),i(l).change()}),detailsidx++}var i=jQuery;new SlugEditor(category,"category"),new ImageUploads(i("#image-category-id").val(),"category");titlePrompt=i("#title-prompt-text"),title=i("#title").bind("focus keydown",function(){titlePrompt.hide()}).blur(function(){""==title.val()?titlePrompt.show():titlePrompt.hide()}),postboxes.add_postbox_toggles("shopp_page_shopp-categories"),i(".if-js-closed").removeClass("if-js-closed").addClass("closed"),i(".postbox a.help").click(function(){return i(this).colorbox({iframe:!0,open:!0,innerWidth:768,innerHeight:480,scrolling:!1}),!1}),i("#workflow").change(function(){setting=i(this).val(),request.page=adminpage,request.id=category,request.id||(request.id="new"),"new"==setting&&(request.id="new",request.next=setting),"close"==setting&&delete request.id,"previous"==setting&&i.each(worklist,function(e,t){t.id==category&&(worklist[e-1]?request.next=worklist[e-1].id:delete request.id)}),"next"==setting&&i.each(worklist,function(e,t){t.id==category&&(worklist[e+1]?request.next=worklist[e+1].id:delete request.id)})}).change(),i("#category").submit(function(){return""==title.val()?(alert(ENTER_CATEGORY_NAME),!1):(this.action=this.action.substr(0,this.action.indexOf("?"))+"?"+i.param(request),!0)}),i("#templates, #details-template, #details-facetedmenu, #variations-template, #variations-pricing, #price-ranges").hide(),i("#spectemplates-setting").change(function(){this.checked?i("#templates, #details-template").show():i("#details-template").hide(),i("#spectemplates-setting").attr("checked")||i("#variations-setting").attr("checked")||i("#templates").hide()}).change(),i("#faceted-setting").change(function(){this.checked?(i("#details-menu").removeClass("options").addClass("menu"),i("#details-facetedmenu, #price-ranges").show()):(i("#details-menu").removeClass("menu").addClass("options"),i("#details-facetedmenu, #price-ranges").hide())}).change(),details&&i.each(details,function(e,i){t(i)}),i("#addPriceLevel").click(function(){e()}),i("#addDetail").click(function(){t()}),i("#variations-setting").bind("toggleui",function(){this.checked?i("#templates, #variations-template, #variations-pricing").show():i("#variations-template, #variations-pricing").hide(),i("#spectemplates-setting").attr("checked")||i("#variations-setting").attr("checked")||i("#templates").hide()}).click(function(){i(this).trigger("toggleui")}).trigger("toggleui"),options&&loadVariations(options.v?options.v:options,prices),i("#addVariationMenu").click(function(){addVariationOptionsMenu()}),i("#pricerange-facetedmenu").change(function(){"custom"==i(this).val()?i("#pricerange-menu, #addPriceLevel").show():i("#pricerange-menu, #addPriceLevel").hide()}).change(),priceranges&&i.each(priceranges,function(t,i){e(i)}),category||i("#title").focus()});

shopp/trunk/core/ui/categories/category.php

@@ -63 +63 @@
 <script type="text/javascript">
 /* <![CDATA[ */
-var flashuploader = <?php echo ($uploader == 'flash' && !(false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && apache_mod_loaded('mod_security')))?'true':'false'; ?>,
-    category = <?php echo (!empty($Category->id))?$Category->id:'false'; ?>,
+var category = <?php echo (!empty($Category->id))?$Category->id:'false'; ?>,
     product = false,
     details = <?php echo isset($Category->specs) ? json_encode($Category->specs) : json_encode('false'); ?>,
@@ -78 +77 @@
     editslug_url = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_edit_slug"); ?>',
     fileverify_url = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "shopp-ajax_verify_file"); ?>',
+    imgul_url            = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php?action=shopp_upload_image", "wp_ajax_shopp_upload_image"); ?>',
     adminpage = '<?php echo $this->Admin->pagename('categories'); ?>',
     request = <?php echo json_encode(stripslashes_deep($_GET)); ?>,
     worklist = <?php echo json_encode($this->categories(true)); ?>,
-    filesizeLimit = <?php echo wp_max_upload_size(); ?>,
+    postsizeLimit        = <?php echo wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) ) / MB_IN_BYTES; ?>,
+    uploadLimit          = <?php echo wp_max_upload_size(); ?>,
+    uploadMaxConnections = <?php echo ( defined('SHOPP_UPLOAD_MAX_CONNECTIONS') ) ? SHOPP_UPLOAD_MAX_CONNECTIONS : 0; ?>,
     priceTypes = <?php echo json_encode($priceTypes); ?>,
     billPeriods = <?php echo json_encode($billPeriods); ?>,

shopp/trunk/core/ui/categories/ui.php

@@ -43 +43 @@
 function images_meta_box ($Category) {
 ?>
-    <ul id="lightbox">
-        <?php if (isset($Category->images) && !empty($Category->images)): ?>
-        <?php foreach ((array)$Category->images as $i => $Image): ?>
-            <li id="image-<?php echo $Image->id; ?>"><input type="hidden" name="images[]" value="<?php echo $Image->id; ?>" />
-            <div id="image-<?php echo $Image->id; ?>-details">
-                <img src="?siid=<?php echo $Image->id; ?>&amp;<?php echo $Image->resizing(96,0,1); ?>" width="96" height="96" />
-                <input type="hidden" name="imagedetails[<?php echo $i; ?>][id]" value="<?php echo $Image->id; ?>" />
-                <input type="hidden" name="imagedetails[<?php echo $i; ?>][title]" value="<?php echo $Image->title; ?>" class="imagetitle" />
-                <input type="hidden" name="imagedetails[<?php echo $i; ?>][alt]" value="<?php echo $Image->alt; ?>"  class="imagealt" />
-                <?php
-                    if (count($Image->cropped) > 0):
-                        foreach ($Image->cropped as $cache):
-                            $cropping = join(',',array($cache->settings['dx'],$cache->settings['dy'],$cache->settings['cropscale']));
-                            $c = "$cache->width:$cache->height"; ?>
-                    <input type="hidden" name="imagedetails[<?php echo $i; ?>][cropping][<?php echo $cache->id; ?>]" alt="<?php echo $c; ?>" value="<?php echo $cropping; ?>" class="imagecropped" />
-                <?php endforeach; endif;?>
+    <script id="lightbox-image-template" type="text/x-jquery-tmpl">
+        <div>
+        <?php ob_start(); ?>
+        <li class="dz-preview dz-file-preview">
+            <div class="dz-details" title="<?php Shopp::_e('Double-click images to edit their details&hellip;'); ?>">
+                <img data-dz-thumbnail width="120" height="120" class="dz-image" />
             </div>
-            <?php echo ShoppUI::button('delete', 'deleteImage', array('type' => 'button', 'class' => 'delete deleteButton', 'value' => $Image->id, 'title' => Shopp::__('Remove image&hellip;')) ); ?>
-            </li>
-        <?php endforeach; endif; ?>
+            <div class="dz-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>
+            <div class="dz-error-mark"><span>&times;</span></div>
+            <div class="dz-error-message"><span data-dz-errormessage></span></div>
+            <?php echo ShoppUI::button('delete', 'deleteImage', array('type' => 'button', 'class' => 'delete', 'value' => '${imageid}', 'title' => Shopp::__('Remove image&hellip;'), 'data-dz-remove' => true) ); ?>
+
+            <input type="hidden" name="images[]" value="${imageid}" class="imageid"/>
+            <input type="hidden" name="imagedetails[${index}][id]" value="${imageid}" class="imageid"/>
+            <input type="hidden" name="imagedetails[${index}][title]" value="${title}" class="imagetitle" />
+            <input type="hidden" name="imagedetails[${index}][alt]" value="${alt}"  class="imagealt" />
+        </li>
+        <?php $preview = ob_get_clean(); echo $preview; ?>
+        </div>
+    </script>
+
+    <div id="confirm-delete-images" class="notice hidden"><p><?php _e('Save the product to confirm deleted images.','Shopp'); ?></p></div>
+    <ul class="lightbox-dropzone">
+    <?php foreach ( (array) $Category->images as $i => $Image ) {
+            echo ShoppUI::template($preview, array(
+                '${index}' => $i,
+                '${imageid}' => $Image->id,
+                '${title}' => $Image->title,
+                '${alt}' => $Image->alt,
+                'data-dz-thumbnail' => sprintf('src="?siid=%d&amp;%s"', $Image->id, $Image->resizing(120, 0, 1)),
+            ));
+    } ?>
     </ul>
     <div class="clear"></div>
-    <input type="hidden" name="category" value="<?php echo $_GET['id']; ?>" id="image-category-id" />
+
+    <input type="hidden" name="category" value="<?php echo $Category->id; ?>" id="image-category-id" />
     <input type="hidden" name="deleteImages" id="deleteImages" value="" />
-    <div id="swf-uploader-button"></div>
-    <div id="swf-uploader">
-    <button type="button" class="button-secondary" name="add-image" id="add-image" tabindex="10"><small><?php Shopp::_e('Add New Image'); ?></small></button></div>
-    <div id="browser-uploader">
-        <button type="button" name="image_upload" id="image-upload" class="button-secondary"><small><?php Shopp::_e('Add New Image'); ?></small></button><br class="clear"/>
-    </div>
 
-    <p><?php Shopp::_e('Double-click images to edit their details. Save the product to confirm deleted images.'); ?></p>
+    <button type="button" name="image_upload" class="button-secondary image-upload"><small><?php Shopp::_e('Add New Image'); ?></small></button>
 <?php
 }

shopp/trunk/core/ui/help/advanced.php

@@ -9 +9 @@
 
 This screen provides access to advanced troubleshooting and maintenance tools.
-
-#### Upload System
-
-The Adobe Flash upload system shows accurate file upload progress and select multiple files to upload at the same time. If you experience problems, however, disable the setting to use browser-based uploads instead.
 
 #### Script Loading

shopp/trunk/core/ui/products/editor.js

@@ -21 +21 @@
     changes = false,
     saving = false,
-    flashUploader = false,
     template = false,
     fileUploads = false,
@@ -93 +92 @@
 
     // Initialize file uploads before the pricelines
-    fileUploads = new FileUploader('flash-upload-file',$('#ajax-upload-file'));
+    fileUploads = new FileUploader('#filechooser');
 
     // Initalize the base price line
@@ -146 +145 @@
 
     // We don't need an AYS dialog when saving
-    $("input[name='save']").click(function() { isSave = true });
+    $("input[name='save']").click(function() { isSave = true; });
 
     // Confirm navigation dialog (avoid people accidentally losing work upon navigation)
@@ -153 +152 @@
         if (!isSave && (changesMade || (editor && editor.isDirty() && !editor.isHidden())) )
             return $msg.confirm;
-    }
+    };
 });
 

shopp/trunk/core/ui/products/editor.min.js

@@ -1 @@
-function categories(){var e=jQuery;e("#product .category-metabox").each(function(){var i=e(this),t=e(this).attr("id").split("-").slice(1).join("-"),n=i.find("div.new-category").hide(),a=i.find("ul.category-tabs"),o=(a.find("li a").click(function(i){i.preventDefault();var t=e(this),a=t.attr("href");t.parent().addClass("tabs").siblings("li").removeClass("tabs"),e(a).show().siblings("div.tabs-panel").hide(),t.parent().hasClass("new-category")?n.slideDown("fast",function(){n.find("input").focus()}):n.hide()}),function(i){return!!e("#new-"+t+"-name").val()&&(i.data+="&"+e(":checked","#"+t+"-checklist").serialize(),e("#"+t+"-add-submit").prop("disabled",!0),i)}),s=function(i,n){var a,o=e("#new"+t+"_parent");e("#"+t+"-add-submit").prop("disabled",!1),"undefined"!=n.parsed.responses[0]&&(a=n.parsed.responses[0].supplemental.newcat_parent)&&(o.before(a),o.remove())};e("#"+t+"-checklist").wpList({alt:"",response:t+"-ajax-response",addBefore:o,addAfter:s}),a.find("li.tabs a").click(),e("#"+t+"-checklist li.popular-category :checkbox, #"+t+"-checklist-pop :checkbox").on("click",function(){var i=e(this),n=i.is(":checked"),a=i.val();a&&i.parents("#taxonomy-"+t).length&&e("#in-"+t+"-"+a+", #in-popular-"+t+"-"+a).attr("checked",n)})}),e(".category-metabox input[type=checkbox]").change(function(){if(!this.checked)return!0;var i,t=new Array;e("#details-menu").children().children().find("input.label").each(function(i,n){t.push(e(n).val())}),i=e(this).val(),e.getJSON(spectemp_url+"&action=shopp_spec_template&category="+i,function(e){if(!e)return!0;for(i in e)e[i].add=!0,t.toString().search(e[i].name)==-1&&addDetail(e[i])}),e.getJSON(opttemp_url+"&action=shopp_options_template&category="+i,function(i){if(!(i&&i.options&&i.prices&&(Object.keys(i.options).length>0||Object.keys(i.prices).length>0)))return!0;var t=e("#variations-setting"),n=i.options.v?i.options.v:i.options,a=!1;t.attr("checked")||t.attr("checked",!0).trigger("toggleui"),optionMenus.length>0?e.each(n,function(i,t){t&&t.name&&t.options&&((menu=optionMenuExists(t.name))?(a=!1,e.each(t.options,function(e,i){i&&i.name&&(optionMenuItemExists(menu,i.name)||(menu.addOption(i),a=!0))}),a&&addVariationPrices()):(delete t.id,e.each(t.options,function(e,i){i&&i.name&&delete i.id}),addVariationOptionsMenu(t)))}):loadVariations(n,i.prices)})})}function tags(){var e=jQuery;e("#product .tags-metabox").each(function(){var i=e(this),t=e(this).attr("id").split("-").slice(1).join("-"),n=i.find(".tags"),a=n.val().split(","),o=new SearchSelector({source:t,parent:i,url:tagsugg_url,fieldname:"tax_input["+t+"]",label:TAG_SEARCHSELECT_LABEL,classname:"tags",freeform:!0,autosuggest:"shopp_popular_tags"});n.val(""),e.each(a,function(e,i){0!=i.length&&o.ui.prepend(o.newItem("",i))})})}var Pricelines=new Pricelines,productOptions=new Array,productAddons=new Array,optionMenus=new Array,addonGroups=new Array,addonOptionsGroup=new Array,selectedMenuOption=!1,detailsidx=1,variationsidx=1,addon_group_idx=1,addonsidx=1,optionsidx=1,pricingidx=1,fileUploader=!1,changes=!1,saving=!1,flashUploader=!1,template=!1,fileUploads=!1,changesMade=!1,isSave=!1;jQuery(document).ready(function(e){var i=e("#title"),t=e("#title-prompt-text"),n=e(".publishdate");i.bind("focus keydown",function(){t.hide()}).blur(function(){""==i.val()?t.show():t.hide()}),product||(i.focus(),t.show()),postboxes.add_postbox_toggles(screenid),e(".if-js-closed").removeClass("if-js-closed").addClass("closed"),e(".postbox a.help").click(function(){return e(this).colorbox({iframe:!0,open:!0,innerWidth:768,innerHeight:480,scrolling:!1}),!1}),e('<div id="publish-calendar" class="calendar"></div>').appendTo("#wpwrap").PopupCalendar({m_input:e("#publish-month"),d_input:e("#publish-date"),y_input:e("#publish-year"),autoinit:!0,title:calendarTitle,startWeek:startWeekday}),e("#schedule-toggle").click(function(){e("#scheduling").slideToggle("fast",function(){e(this).is(":visible")?n.removeAttr("disabled"):n.attr("disabled",!0)})}),e("#scheduling").hide(),n.attr("disabled",!0),e("#published").change(function(){e(this).prop("checked")?e("#publish-status,#schedule-toggling").show():e("#publish-status,#schedule-toggling,#scheduling").hide()}).change(),e("#process-time").change(function(){var i=e("#processing");e(this).prop("checked")?i.slideDown("fast"):i.hide()}).change(),editslug=new SlugEditor(product,"product"),specs&&e.each(specs,function(){addDetail(this)}),e("#addDetail").click(function(){addDetail()}),fileUploads=new FileUploader("flash-upload-file",e("#ajax-upload-file")),basePrice=e(prices).get(0),basePrice&&"product"==basePrice.context?Pricelines.add(!1,basePrice,"#product-pricing"):Pricelines.add(!1,!1,"#product-pricing"),e("#variations-setting").bind("toggleui",variationsToggle).click(function(){e(this).trigger("toggleui")}).trigger("toggleui"),loadVariations(options&&(options.v||options.a)?options.v:options,prices),e("#addVariationMenu").click(function(){addVariationOptionsMenu()}),e("#linkOptionVariations").click(linkVariationsButton).change(linkVariationsButtonLabel),e("#addons-setting").bind("toggleui",addonsToggle).click(function(){e(this).trigger("toggleui")}).trigger("toggleui"),e("#newAddonGroup").click(function(){newAddonGroup()}),options&&options.a&&loadAddons(options.a,prices),imageUploads=new ImageUploads(e("#image-product-id").val(),"product"),categories(),tags(),quickSelects(),e("#product").change(function(){changes=!0}).unbind("submit").submit(function(t){if(t.stopPropagation(),""==i.val())return alert(ENTER_PRODUCT_NAME),!1;var n=e("#product").attr("action").split("?"),a=n[0]+"?"+e.param(request);return e("#product")[0].setAttribute("action",a),saving=!0,!0}),e("#prices-loading").remove(),e("input").on("change",function(){changesMade=!0,e(this).off("change")}),e("input[name='save']").click(function(){isSave=!0}),window.onbeforeunload=function(){var e="undefined"!=typeof tinymce&&tinymce.activeEditor;if(!isSave&&(changesMade||e&&e.isDirty()&&!e.isHidden()))return $msg.confirm}});
+function categories(){var e=jQuery;e("#product .category-metabox").each(function(){var i=e(this),t=e(this).attr("id").split("-").slice(1).join("-"),n=i.find("div.new-category").hide(),a=i.find("ul.category-tabs");a.find("li a").click(function(i){i.preventDefault();var t=e(this),a=t.attr("href");t.parent().addClass("tabs").siblings("li").removeClass("tabs"),e(a).show().siblings("div.tabs-panel").hide(),t.parent().hasClass("new-category")?n.slideDown("fast",function(){n.find("input").focus()}):n.hide()});e("#"+t+"-checklist").wpList({alt:"",response:t+"-ajax-response",addBefore:function(i){return!!e("#new-"+t+"-name").val()&&(i.data+="&"+e(":checked","#"+t+"-checklist").serialize(),e("#"+t+"-add-submit").prop("disabled",!0),i)},addAfter:function(i,n){var a,o=e("#new"+t+"_parent");e("#"+t+"-add-submit").prop("disabled",!1),"undefined"!=n.parsed.responses[0]&&(a=n.parsed.responses[0].supplemental.newcat_parent)&&(o.before(a),o.remove())}}),a.find("li.tabs a").click(),e("#"+t+"-checklist li.popular-category :checkbox, #"+t+"-checklist-pop :checkbox").on("click",function(){var i=e(this),n=i.is(":checked"),a=i.val();a&&i.parents("#taxonomy-"+t).length&&e("#in-"+t+"-"+a+", #in-popular-"+t+"-"+a).attr("checked",n)})}),e(".category-metabox input[type=checkbox]").change(function(){if(!this.checked)return!0;var i,t=new Array;e("#details-menu").children().children().find("input.label").each(function(i,n){t.push(e(n).val())}),i=e(this).val(),e.getJSON(spectemp_url+"&action=shopp_spec_template&category="+i,function(e){if(!e)return!0;for(i in e)e[i].add=!0,-1==t.toString().search(e[i].name)&&addDetail(e[i])}),e.getJSON(opttemp_url+"&action=shopp_options_template&category="+i,function(i){if(!(i&&i.options&&i.prices&&(Object.keys(i.options).length>0||Object.keys(i.prices).length>0)))return!0;var t=e("#variations-setting"),n=i.options.v?i.options.v:i.options,a=!1;t.attr("checked")||t.attr("checked",!0).trigger("toggleui"),optionMenus.length>0?e.each(n,function(i,t){t&&t.name&&t.options&&((menu=optionMenuExists(t.name))?(a=!1,e.each(t.options,function(e,i){i&&i.name&&(optionMenuItemExists(menu,i.name)||(menu.addOption(i),a=!0))}),a&&addVariationPrices()):(delete t.id,e.each(t.options,function(e,i){i&&i.name&&delete i.id}),addVariationOptionsMenu(t)))}):loadVariations(n,i.prices)})})}function tags(){var e=jQuery;e("#product .tags-metabox").each(function(){var i=e(this),t=e(this).attr("id").split("-").slice(1).join("-"),n=i.find(".tags"),a=n.val().split(","),o=new SearchSelector({source:t,parent:i,url:tagsugg_url,fieldname:"tax_input["+t+"]",label:TAG_SEARCHSELECT_LABEL,classname:"tags",freeform:!0,autosuggest:"shopp_popular_tags"});n.val(""),e.each(a,function(e,i){0!=i.length&&o.ui.prepend(o.newItem("",i))})})}var Pricelines=new Pricelines,productOptions=new Array,productAddons=new Array,optionMenus=new Array,addonGroups=new Array,addonOptionsGroup=new Array,selectedMenuOption=!1,detailsidx=1,variationsidx=1,addon_group_idx=1,addonsidx=1,optionsidx=1,pricingidx=1,fileUploader=!1,changes=!1,saving=!1,template=!1,fileUploads=!1,changesMade=!1,isSave=!1;jQuery(document).ready(function(e){var i=e("#title"),t=e("#title-prompt-text"),n=e(".publishdate");i.bind("focus keydown",function(){t.hide()}).blur(function(){""==i.val()?t.show():t.hide()}),product||(i.focus(),t.show()),postboxes.add_postbox_toggles(screenid),e(".if-js-closed").removeClass("if-js-closed").addClass("closed"),e(".postbox a.help").click(function(){return e(this).colorbox({iframe:!0,open:!0,innerWidth:768,innerHeight:480,scrolling:!1}),!1}),e('<div id="publish-calendar" class="calendar"></div>').appendTo("#wpwrap").PopupCalendar({m_input:e("#publish-month"),d_input:e("#publish-date"),y_input:e("#publish-year"),autoinit:!0,title:calendarTitle,startWeek:startWeekday}),e("#schedule-toggle").click(function(){e("#scheduling").slideToggle("fast",function(){e(this).is(":visible")?n.removeAttr("disabled"):n.attr("disabled",!0)})}),e("#scheduling").hide(),n.attr("disabled",!0),e("#published").change(function(){e(this).prop("checked")?e("#publish-status,#schedule-toggling").show():e("#publish-status,#schedule-toggling,#scheduling").hide()}).change(),e("#process-time").change(function(){var i=e("#processing");e(this).prop("checked")?i.slideDown("fast"):i.hide()}).change(),editslug=new SlugEditor(product,"product"),specs&&e.each(specs,function(){addDetail(this)}),e("#addDetail").click(function(){addDetail()}),fileUploads=new FileUploader("#filechooser"),basePrice=e(prices).get(0),basePrice&&"product"==basePrice.context?Pricelines.add(!1,basePrice,"#product-pricing"):Pricelines.add(!1,!1,"#product-pricing"),e("#variations-setting").bind("toggleui",variationsToggle).click(function(){e(this).trigger("toggleui")}).trigger("toggleui"),loadVariations(options&&(options.v||options.a)?options.v:options,prices),e("#addVariationMenu").click(function(){addVariationOptionsMenu()}),e("#linkOptionVariations").click(linkVariationsButton).change(linkVariationsButtonLabel),e("#addons-setting").bind("toggleui",addonsToggle).click(function(){e(this).trigger("toggleui")}).trigger("toggleui"),e("#newAddonGroup").click(function(){newAddonGroup()}),options&&options.a&&loadAddons(options.a,prices),imageUploads=new ImageUploads(e("#image-product-id").val(),"product"),categories(),tags(),quickSelects(),e("#product").change(function(){changes=!0}).unbind("submit").submit(function(t){if(t.stopPropagation(),""==i.val())return alert(ENTER_PRODUCT_NAME),!1;var n=e("#product").attr("action").split("?")[0]+"?"+e.param(request);return e("#product")[0].setAttribute("action",n),saving=!0,!0}),e("#prices-loading").remove(),e("input").on("change",function(){changesMade=!0,e(this).off("change")}),e("input[name='save']").click(function(){isSave=!0}),window.onbeforeunload=function(){var e="undefined"!=typeof tinymce&&tinymce.activeEditor;if(!isSave&&(changesMade||e&&e.isDirty()&&!e.isHidden()))return $msg.confirm}});

shopp/trunk/core/ui/products/editor.php

@@ -50 +50 @@
                     </div>
                 </div>
-                
+
                 <?php do_action( 'edit_form_after_title', $Product ); ?>
 
@@ -78 +78 @@
 /* <![CDATA[ */
 jQuery('.hide-if-no-js').removeClass('hide-if-no-js');
-var flashuploader       = <?php echo ($uploader == 'flash' && !(false !== strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'mac') && apache_mod_loaded('mod_security'))) ? 'true' : 'false'; ?>,
-    product             = <?php echo (!empty($Product->id))?$Product->id:'false'; ?>,
-    prices              = <?php echo json_encode($Product->prices) ?>,
-    specs               = <?php $specs = array(); foreach ( $Product->specs as $Spec ) $specs[] = $Spec->json(array('context', 'type', 'numeral', 'sortorder', 'created', 'modified')); echo json_encode($specs); ?>,
-    options             = <?php echo json_encode($Product->options) ?>,
-    priceTypes          = <?php echo json_encode($priceTypes) ?>,
-    billPeriods         = <?php echo json_encode($billPeriods) ?>,
-    shiprates           = <?php echo json_encode($shiprates); ?>,
-    uidir               = '<?php echo SHOPP_ADMIN_URI; ?>',
-    siteurl             = '<?php bloginfo('url'); ?>',
-    screenid            = '<?php echo get_current_screen()->id; ?>',
-    canonurl            = '<?php echo trailingslashit(Shopp::url()); ?>',
-    adminurl            = '<?php echo admin_url(); ?>',
-    sugg_url            = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_storage_suggestions"); ?>',
-    tagsugg_url         = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_suggestions"); ?>',
-    spectemp_url        = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_spec_template"); ?>',
-    opttemp_url         = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_options_template"); ?>',
-    addcategory_url     = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_add_category"); ?>',
-    editslug_url        = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_edit_slug"); ?>',
-    fileverify_url      = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_verify_file"); ?>',
-    fileimport_url      = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_import_file"); ?>',
-    imageul_url         = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_upload_image"); ?>',
-    adminpage           = '<?php echo $this->Admin->pagename('products'); ?>',
-    request             = <?php echo json_encode(stripslashes_deep($_GET)); ?>,
-    filesizeLimit       = <?php echo wp_max_upload_size(); ?>,
-    weightUnit          = '<?php echo shopp_setting('weight_unit'); ?>',
-    dimensionUnit       = '<?php echo shopp_setting('dimension_unit'); ?>',
-    storage             = '<?php echo shopp_setting('product_storage'); ?>',
-    productspath        = '<?php /* realpath needed for relative paths */ chdir(WP_CONTENT_DIR); echo addslashes(trailingslashit(sanitize_path(realpath(shopp_setting('products_path'))))); ?>',
-    imageupload_debug   = <?php echo (defined('SHOPP_IMAGEUPLOAD_DEBUG') && SHOPP_IMAGEUPLOAD_DEBUG)?'true':'false'; ?>,
-    fileupload_debug    = <?php echo (defined('SHOPP_FILEUPLOAD_DEBUG') && SHOPP_FILEUPLOAD_DEBUG)?'true':'false'; ?>,
-    dimensionsRequired  = <?php echo $Shopp->Shipping->dimensions?'true':'false'; ?>,
-    startWeekday        = <?php echo get_option('start_of_week'); ?>,
-    calendarTitle       = '<?php $df = date_format_order(true); $format = $df["month"]." ".$df["year"]; echo $format; ?>',
+var product              = <?php echo (!empty($Product->id))?$Product->id:'false'; ?>,
+    prices               = <?php echo json_encode($Product->prices) ?>,
+    specs                = <?php $specs = array(); foreach ( $Product->specs as $Spec ) $specs[] = $Spec->json(array('context', 'type', 'numeral', 'sortorder', 'created', 'modified')); echo json_encode($specs); ?>,
+    options              = <?php echo json_encode($Product->options) ?>,
+    priceTypes           = <?php echo json_encode($priceTypes) ?>,
+    billPeriods          = <?php echo json_encode($billPeriods) ?>,
+    shiprates            = <?php echo json_encode($shiprates); ?>,
+    uidir                = '<?php echo SHOPP_ADMIN_URI; ?>',
+    siteurl              = '<?php bloginfo('url'); ?>',
+    screenid             = '<?php echo get_current_screen()->id; ?>',
+    canonurl             = '<?php echo trailingslashit(Shopp::url()); ?>',
+    adminurl             = '<?php echo admin_url(); ?>',
+    sugg_url             = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_storage_suggestions"); ?>',
+    tagsugg_url          = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_suggestions"); ?>',
+    spectemp_url         = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_spec_template"); ?>',
+    opttemp_url          = '<?php echo wp_nonce_url(admin_url('admin-ajax.php'), "wp_ajax_shopp_options_template"); ?>',
+    addcategory_url      = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_add_category"); ?>',
+    editslug_url         = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_edit_slug"); ?>',
+    fileverify_url       = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_verify_file"); ?>',
+    fileimport_url       = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php", "wp_ajax_shopp_import_file"); ?>',
+    fileupload_url       = '<?php echo admin_url()."admin-ajax.php?action=shopp_upload_file"; ?>',
+    imgul_url            = '<?php echo wp_nonce_url(admin_url()."admin-ajax.php?action=shopp_upload_image", "wp_ajax_shopp_upload_image"); ?>',
+    adminpage            = '<?php echo $this->Admin->pagename('products'); ?>',
+    request              = <?php echo json_encode(stripslashes_deep($_GET)); ?>,
+    postsizeLimit        = <?php echo wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) ) / MB_IN_BYTES; ?>,
+    uploadLimit          = <?php echo wp_max_upload_size(); ?>,
+    chunkSize            = 524288,
+    uploadMaxConnections = <?php echo ( defined('SHOPP_UPLOAD_MAX_CONNECTIONS') ) ? SHOPP_UPLOAD_MAX_CONNECTIONS : 5; ?>,
+    weightUnit           = '<?php echo shopp_setting('weight_unit'); ?>',
+    dimensionUnit        = '<?php echo shopp_setting('dimension_unit'); ?>',
+    storage              = '<?php echo shopp_setting('product_storage'); ?>',
+    productspath         = '<?php /* realpath needed for relative paths */ chdir(WP_CONTENT_DIR); echo addslashes(trailingslashit(sanitize_path(realpath(shopp_setting('products_path'))))); ?>',
+    imageupload_debug    = <?php echo ( defined('SHOPP_IMAGEUPLOAD_DEBUG') && SHOPP_IMAGEUPLOAD_DEBUG ) ? 'true' : 'false'; ?>,
+    fileupload_debug     = <?php echo ( defined('SHOPP_FILEUPLOAD_DEBUG') && SHOPP_FILEUPLOAD_DEBUG ) ? 'true' : 'false'; ?>,
+    dimensionsRequired   = <?php echo $Shopp->Shipping->dimensions?'true':'false'; ?>,
+    startWeekday         = <?php echo get_option('start_of_week'); ?>,
+    calendarTitle        = '<?php $df = date_format_order(true); $format = $df["month"]." ".$df["year"]; echo $format; ?>',
 
     // Warning/Error Dialogs

shopp/trunk/core/ui/products/ui.php

@@ -246 +246 @@
 function images_meta_box ($Product) {
 ?>
-    <div id="confirm-delete-images" class="notice hidden"><p><?php Shopp::_e('Save the product to confirm deleted images.'); ?></p></div>
-    <ul id="lightbox">
-    <?php foreach ( (array) $Product->images as $i => $Image ): ?>
-        <li id="image-<?php echo (int)$Image->id; ?>"><input type="hidden" name="images[]" value="<?php echo $Image->id; ?>" />
-            <div id="image-<?php echo (int)$Image->id; ?>-details" title="<?php Shopp::_e('Double-click images to edit their details&hellip;'); ?>">
-                <img src="?siid=<?php echo (int)$Image->id; ?>&amp;<?php echo $Image->resizing(96,0,1); ?>" width="96" height="96" />
-                <input type="hidden" name="imagedetails[<?php echo (int)$i; ?>][id]" value="<?php echo (int)$Image->id; ?>" />
-                <input type="hidden" name="imagedetails[<?php echo (int)$i; ?>][title]" value="<?php echo $Image->title; ?>" class="imagetitle" />
-                <input type="hidden" name="imagedetails[<?php echo (int)$i; ?>][alt]" value="<?php echo $Image->alt; ?>"  class="imagealt" />
-                <?php
-                    if ( isset($Product->cropped) && count($Product->cropped) > 0 && isset($Product->cropped[ $Image->id ]) ):
-
-                        $cropped = is_array($Product->cropped[ $Image->id ]) ? $Product->cropped[ $Image->id ] : array($Product->cropped[$Image->id]);
-
-                        foreach ($cropped as $cache):
-                            $cropimage = unserialize($cache->value);
-                            $cropdefaults = array('dx' => '','dy' => '','cropscale' => '');
-                            $cropsettings = array_intersect_key($cropimage->settings, $cropdefaults);
-                            $cropping = ( array_filter($cropsettings) == array() ) ? '' : join(',', array_merge($cropdefaults, $cropsettings));
-                            $c = "$cropimage->width:$cropimage->height";
-                ?>
-                    <input type="hidden" name="imagedetails[<?php echo $i; ?>][cropping][<?php echo $cache->id; ?>]" alt="<?php echo $c; ?>" value="<?php echo $cropping; ?>" class="imagecropped" />
-                <?php endforeach; endif; ?>
+    <script id="lightbox-image-template" type="text/x-jquery-tmpl">
+        <div>
+        <?php ob_start(); ?>
+        <li class="dz-preview dz-file-preview">
+            <div class="dz-details" title="<?php Shopp::_e('Double-click images to edit their details&hellip;'); ?>">
+                <img data-dz-thumbnail width="120" height="120" class="dz-image" />
             </div>
-            <?php echo ShoppUI::button('delete', 'deleteImage', array('type' => 'button', 'class' => 'delete', 'value' => $Image->id, 'title' => Shopp::__('Remove image&hellip;')) ); ?>
-            </li>
-    <?php endforeach; ?>
+            <div class="dz-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>
+            <div class="dz-error-mark"><span>&times;</span></div>
+            <div class="dz-error-message"><span data-dz-errormessage></span></div>
+            <?php echo ShoppUI::button('delete', 'deleteImage', array('type' => 'button', 'class' => 'delete', 'value' => '${imageid}', 'title' => Shopp::__('Remove image&hellip;'), 'data-dz-remove' => true) ); ?>
+
+            <input type="hidden" name="images[]" value="${imageid}" class="imageid"/>
+            <input type="hidden" name="imagedetails[${index}][id]" value="${imageid}" class="imageid"/>
+            <input type="hidden" name="imagedetails[${index}][title]" value="${title}" class="imagetitle" />
+            <input type="hidden" name="imagedetails[${index}][alt]" value="${alt}"  class="imagealt" />
+        </li>
+        <?php $preview = ob_get_clean(); echo $preview; ?>
+        </div>
+    </script>
+
+    <div id="confirm-delete-images" class="notice hidden"><p><?php _e('Save the product to confirm deleted images.','Shopp'); ?></p></div>
+    <ul class="lightbox-dropzone">
+    <?php foreach ( (array) $Product->images as $i => $Image ) {
+            echo ShoppUI::template($preview, array(
+                '${index}' => $i,
+                '${imageid}' => $Image->id,
+                '${title}' => $Image->title,
+                '${alt}' => $Image->alt,
+                'data-dz-thumbnail' => sprintf('src="?siid=%d&amp;%s"', $Image->id, $Image->resizing(120, 0, 1)),
+            ));
+    } ?>
     </ul>
     <div class="clear"></div>
-    <input type="hidden" name="product" value="<?php echo preg_replace('/[^0-9]/', '', $_GET['id']); ?>" id="image-product-id" />
+
+    <input type="hidden" name="product" value="<?php echo $_GET['id']; ?>" id="image-product-id" />
     <input type="hidden" name="deleteImages" id="deleteImages" value="" />
-    <div id="swf-uploader-button"></div>
-    <div id="browser-uploader">
-        <button type="button" name="image_upload" id="image-upload" class="button-secondary"><small><?php Shopp::_e('Add New Image'); ?></small></button><br class="clear"/>
-    </div>
+
+    <button type="button" name="image_upload" class="button-secondary image-upload"><small><?php Shopp::_e('Add New Image'); ?></small></button>
 <?php
 }
@@ -356 +360 @@
     <input type="hidden" name="prices" value="" id="prices" /></div>
 
-<div id="chooser">
+<div id="filechooser">
     <p><label for="import-url"><?php Shopp::_e('Attach file by URL'); ?>&hellip;</label></p>
-    <p><span class="fileimporter"><input type="text" name="url" id="import-url" class="fileimport" /><span class="shoppui-spin-align"><span class="status"></span></span></span><button class="button-secondary" id="attach-file"><small><?php Shopp::_e('Attach File'); ?></small></button><br /><span><label for="import-url">file:///path/to/file.zip<?php if ( ! in_array('http', stream_get_wrappers()) ): ?>, http://server.com/file.zip<?php endif; ?></label></span></p>
-    <label class="alignleft"><?php Shopp::_e('Select a file from your computer'); ?>:</label>
-    <div class=""><div id="flash-upload-file"></div><button id="ajax-upload-file" class="button-secondary"><small><?php Shopp::_e('Upload File'); ?></small></button></div>
-</div>
+    <p><span class="fileimporter"><input type="text" name="url" id="import-url" class="fileimport" /><span class="shoppui-spin-align"><span class="status"></span></span></span><button class="button-secondary" id="attach-file"><small><?php Shopp::_e('Attach File'); ?></small></button><br /><span><label for="import-url">file:///path/to/file.zip<?php if (!in_array('http',stream_get_wrappers())): ?>, http://server.com/file.zip<?php endif; ?></label></span></p>
+    <div><button id="filechooser-upload-file" class="button-secondary filechooser-upload"><small><?php Shopp::_e('Upload a file from your device'); ?></small></button></div>
+</div>
+
+<script id="filechooser-upload-template" type="text/x-jquery-tmpl">
+<div>
+    <div class="file dz-preview dz-file-preview">
+        <div class="icon shoppui-file"></div>
+        <span class="name dz-filename" data-dz-name></span>
+        <small class="size dz-size" data-dz-size></small>
+        <div class="dz-progress"><span class="dz-upload" data-dz-uploadprogress></span></div>
+        <div class="dz-error-message"><span data-dz-errormessage></span></div>
+    </div>
+</div>
+</script>
 
 <?php

shopp/trunk/core/ui/settings/advanced.php

@@ -15 +15 @@
 
             <tr>
-                <th scope="row" valign="top"><label for="uploader-toggle"><?php Shopp::_e('Upload System'); ?></label></th>
-                <td><input type="hidden" name="settings[uploader_pref]" value="browser" /><input type="checkbox" name="settings[uploader_pref]" value="flash" id="uploader-toggle"<?php if (shopp_setting('uploader_pref') == "flash") echo ' checked="checked"'?> /><label for="uploader-toggle"> <?php Shopp::_e('Enable Flash-based uploading'); ?></label><br />
-                <?php Shopp::_e('Enable to use Adobe Flash uploads for accurate upload progress. Disable this setting if you are having problems uploading.'); ?></td>
-            </tr>
-            <tr>
                 <th scope="row" valign="top"><label for="script-server"><?php Shopp::_e('Script Loading'); ?></label></th>
                 <td><input type="hidden" name="settings[script_server]" value="script" /><input type="checkbox" name="settings[script_server]" value="plugin" id="script-server"<?php if (shopp_setting('script_server') == "plugin") echo ' checked="checked"'?> /><label for="script-server"> <?php Shopp::_e('Load behavioral scripts through WordPress'); ?></label><br />
@@ -32 +27 @@
                 <td><input type="hidden" name="settings[image_server]" value="off" /><input type="checkbox" name="settings[image_server]" value="on" id="image-server"<?php if ( "on" == shopp_setting('image_server') ) echo ' checked="checked"'; ?> /><label for="image-server"> <?php Shopp::_e('Toggle this option if images don\'t show on storefront.<br /> <small>(Needs resaving of permalinks.)<small>'); ?></label>
                 </td>
-            </tr>           
+            </tr>
 
             <tr>

shopp/trunk/core/ui/styles/admin.css

@@ -85 +85 @@
 /** Editors Global **/
 .postbox h3 span a.shoppui-question,
+.postbox .hndle a.shoppui-question,
 .postbox label a.shoppui-question,
 .subpanel label a.shoppui-question { color: #767676; margin-bottom:-3px;margin-top:-2px;margin-left:5px;top:5px;display:inline-block;width:12px;height:13px;border:none;text-decoration:none; cursor:pointer; text-shadow: 0 1px 1px #fff; }
 .postbox h3 span a.shoppui-question:hover,
+.postbox .hndle a.shoppui-question:hover,
 .postbox label a.shoppui-question:hover,
 .subpanel label a.shoppui-question:hover { color: #464646; }
@@ -107 +109 @@
 #schedule-toggling,#schedule-calendar { text-indent: 0; }
 #scheduling input { text-align: center; }
+
+/** Dropzone **/
+@-webkit-keyframes passing-through { 0% { opacity:0;-webkit-transform:translateY(40px);-ms-transform:translateY(40px);transform:translateY(40px); }
+30%,70% { opacity:1;-webkit-transform:translateY(0px);-ms-transform:translateY(0px);transform:translateY(0px); }
+100% { opacity:0;-webkit-transform:translateY(-40px);-ms-transform:translateY(-40px);transform:translateY(-40px); }
+ }
+@keyframes passing-through { 0% { opacity:0;-webkit-transform:translateY(40px);-ms-transform:translateY(40px);transform:translateY(40px); }
+30%,70% { opacity:1;-webkit-transform:translateY(0px);-ms-transform:translateY(0px);transform:translateY(0px); }
+100% { opacity:0;-webkit-transform:translateY(-40px);-ms-transform:translateY(-40px);transform:translateY(-40px); }
+ }
+@-webkit-keyframes slide-in { 0% { opacity:0;-webkit-transform:translateY(40px);-ms-transform:translateY(40px);transform:translateY(40px); }
+30% { opacity:1;-webkit-transform:translateY(0px);-ms-transform:translateY(0px);transform:translateY(0px); }
+ }
+@keyframes slide-in { 0% { opacity:0;-webkit-transform:translateY(40px);-ms-transform:translateY(40px);transform:translateY(40px); }
+30% { opacity:1;-webkit-transform:translateY(0px);-ms-transform:translateY(0px);transform:translateY(0px); }
+ }
+@-webkit-keyframes pulse { 0% { -webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1); }
+10% { -webkit-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1); }
+20% { -webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1); }
+ }
+@keyframes pulse { 0% { -webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1); }
+10% { -webkit-transform:scale(1.1);-ms-transform:scale(1.1);transform:scale(1.1); }
+20% { -webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1); }
+ }
+.lightbox-dropzone { box-sizing:border-box;min-height:150px;list-style-type:none;margin:0;margin-left:-5px;padding:5px;border:1px solid transparent;margin-bottom:20px; }
+.lightbox-dropzone.dz-drag-hover { border:1px dashed #dfdfdf; }
+.lightbox-dropzone .dz-preview { position:relative;display:inline-block;vertical-align:top;background:#ffffff;margin:0 10px 10px 0;padding:5px;width:120px;height:120px;border:1px solid #dfdfdf;z-index:1; }
+.lightbox-dropzone .dz-error .dz-image { filter:contrast(50%) saturate(0%) brightness(150%);-webkit-transition:filter 0.2s ease-out; }
+.lightbox-dropzone .dz-preview:hover { z-index:1000; }
+.lightbox-dropzone .dz-preview:hover .dz-details { opacity:1; }
+.lightbox-dropzone .dz-preview.dz-file-preview .dz-details { opacity:1; }
+.lightbox-dropzone .dz-preview.dz-image-preview .dz-details { -webkit-transition:opacity 0.2s linear;transition:opacity 0.2s linear; }
+.lightbox-dropzone .dz-preview .dz-remove { font-size:14px;text-align:center;display:block;cursor:pointer;border:none; }
+.lightbox-dropzone .dz-preview .delete { margin:0;width:16px;height:16px;position:absolute;top:-4px;right:-5px;z-index:10;visibility:hidden; }
+.lightbox-dropzone .dz-preview:not(.dz-error):hover .delete { visibility:visible; }
+.lightbox-dropzone .dz-preview .dz-remove:hover { text-decoration:underline; }
+.lightbox-dropzone .dz-preview .dz-details .dz-size { margin-bottom:1em;font-size:16px; }
+.lightbox-dropzone .dz-preview .dz-details .dz-filename { white-space:nowrap; }
+.lightbox-dropzone .dz-preview .dz-image img { display:block; }
+.lightbox-dropzone .dz-preview:hover .dz-image img { -webkit-transform:scale(1.05,1.05);-ms-transform:scale(1.05,1.05);transform:scale(1.05,1.05);-webkit-filter:blur(8px);filter:blur(8px); }
+.lightbox-dropzone .dz-preview .dz-image { pointer-events:none;overflow:hidden;width:120px;height:120px;position:relative;display:block;z-index:10; }
+.lightbox-dropzone .dz-preview.dz-success .dz-success-mark { -webkit-animation:passing-through 3s cubic-bezier(0.77,0,0.175,1);animation:passing-through 3s cubic-bezier(0.77,0,0.175,1); }
+.lightbox-dropzone .dz-preview.dz-error .dz-error-mark { opacity:1;-webkit-animation:slide-in 3s cubic-bezier(0.77,0,0.175,1);animation:slide-in 3s cubic-bezier(0.77,0,0.175,1); }
+.lightbox-dropzone .dz-preview .dz-success-mark,
+.lightbox-dropzone .dz-preview .dz-error-mark { pointer-events:none;opacity:0;z-index:500;position:absolute;display:block;top:calc(50% - 30px);left:calc(50% - 15px);color:#ffffff;text-shadow:-2px 0 #be2626,0 2px #be2626,2px 0 #be2626,0 -2px #be2626;font-size:60px;line-height:60px; }
+.lightbox-dropzone .dz-preview.dz-processing .dz-progress { opacity:1;-webkit-transition:all 0.2s linear;transition:all 0.2s linear; }
+.lightbox-dropzone .dz-preview.dz-complete .dz-progress { opacity:0;-webkit-transition:opacity 0.4s ease-in;transition:opacity 0.4s ease-in; }
+.lightbox-dropzone .dz-preview:not(.dz-processing) .dz-progress { -webkit-animation:pulse 6s ease infinite;animation:pulse 6s ease infinite; }
+.lightbox-dropzone .dz-preview .dz-progress { opacity:0;z-index:1000;pointer-events:none;position:absolute;height:10px;left:50%;top:50%;margin-top:-8px;width:80px;margin-left:-40px;background:rgba(255,255,255,0.7);border:2px solid rgba(255,255,255,0.7);-webkit-transform:scale(1);border-radius:8px;overflow:hidden; }
+.lightbox-dropzone .dz-preview .dz-progress .dz-upload { background:#333;background:linear-gradient(to bottom,#666666,#444444);position:absolute;top:0;left:0;bottom:0;width:0;-webkit-transition:width 300ms ease-in-out;transition:width 300ms ease-in-out; }
+.lightbox-dropzone .dz-preview.dz-error:hover .dz-error-message { cursor:pointer;opacity:1;pointer-events:auto; }
+.lightbox-dropzone .dz-preview .dz-error-message { font-size:12px;letter-spacing:-0.03em;display:block;width:130px;height:130px;box-sizing:border-box;padding:10px;z-index:1000;position:absolute;top:0;left:0;opacity:0;background:linear-gradient(to bottom,#ffffff,#e8e8e8);-webkit-transition:opacity 0.3s ease;transition:opacity 0.3s ease;pointer-events:none; }
+.lightbox-dropzone .ui-sortable-handle { cursor:move; }
 
 /** Image details modal **/
@@ -288 +343 @@
 .form-table.pricing { border-bottom:1px solid #dfdfdf; }
 
-#chooser { font-size:11px;position:absolute;left:-9999em;width:360px; }
-#chooser p { font-size:11px;margin:6px 0 8px;line-height:1; }
-#cboxContent #chooser { left:auto; }
-#cboxContent #chooser label { margin:0;padding:6px 0;text-align:left;width:auto; }
-
-div.progress { position:relative;width:76px;height:10px;background:#ffffff;border:1px solid #dddddd; }
-div.progress div.bar { position:absolute;height:10px;background:#85ec3d;border:none; }
-div.progress div.gloss { position:absolute;width:100%;height:10px;background:url('../icons/gloss.png') repeat-x; }
-
+/** Priceline file chooser **/
+#filechooser { font-size:11px;position:absolute;left:-9999em;width:360px; }
+#filechooser p { font-size:11px;margin:6px 0 8px;line-height:1; }
+#cboxContent #filechooser { left:auto; }
+#cboxContent #filechooser label { margin:0;padding:6px 0;text-align:left;width:auto; }
+.filechooser-upload { width:100%; }
+.pricing-table .dz-filename { display:block; }
+.pricing-table .dz-size { display:inline-block; }
+.pricing-table .dz-error { color:#999; }
+.pricing-table .dz-error-message { color:#900;font-weight:bold; }
+.pricing-table .dz-preview.dz-processing .dz-progress { opacity:1;-webkit-transition:all 0.2s linear;transition:all 0.2s linear; }
+.pricing-table .dz-preview.dz-complete .dz-progress { opacity:0;-webkit-transition:opacity 0.4s ease-in;transition:opacity 0.4s ease-in; }
+.pricing-table .dz-preview:not(.dz-processing) .dz-progress { -webkit-animation:pulse 6s ease infinite;animation:pulse 6s ease infinite; }
+.pricing-table .dz-preview.dz-error .dz-progress { opacity:0;-webkit-transition:opacity 0.4s ease-out;transition:opacity 0.4s ease-out; }
+.pricing-table .dz-preview .dz-progress { display:inline-block;opacity:0;z-index:1000;pointer-events:none;position:relative;height:8px;top:2px;width:80px;background:rgba(255,255,255,0.7);border:2px solid rgba(255,255,255,0.7);-webkit-transform:scale(1);border-radius:8px;overflow:hidden; }
+.pricing-table .dz-preview .dz-progress .dz-upload { background:#333;background:linear-gradient(to bottom,#666666,#444444);position:absolute;top:0;left:0;bottom:0;width:0;-webkit-transition:width 300ms ease-in-out;transition:width 300ms ease-in-out; }
+
+/** Slug Editor **/
 #editable-slug-full,#editor-slug-buttons { display:none; }
 #editable-slug { background-color:#fffbcc;float:none;padding:0; }

shopp/trunk/readme.md

@@ -10 +10 @@
 
 ## Downloads
-- [Latest release (1.3.12)](https://github.com/ingenesis/shopp/releases/tag/1.3.12)
-- [Current dev (1.3.13.dev)](https://github.com/ingenesis/shopp/archive/1.3.x.zip)
+- [Latest release (1.3.13)](https://github.com/ingenesis/shopp/releases/tag/1.3.13)
+- [Current dev (1.3.14dev)](https://github.com/ingenesis/shopp/archive/1.3.14dev.zip)
 - [Future dev (1.4.dev)](https://github.com/ingenesis/shopp/archive/master.zip)