Minor fixes and changes.

Author: gregpriday

Origin.php

@@ -262,6 +262,10 @@ function action_admin_enqueue_scripts(){
 		wp_enqueue_script('origin.admin', ORIGIN_BASE_URL.'/js/origin.js', array('jquery'));
 		wp_enqueue_style('origin.admin', ORIGIN_BASE_URL.'/css/admin.css');
 
+		// Chosen
+		wp_enqueue_script('jquery.chosen', ORIGIN_BASE_URL.'/externals/chosen/chosen.jquery.js', array('jquery'));
+		wp_enqueue_style('jquery.chosen', ORIGIN_BASE_URL.'/externals/chosen/chosen.css');
+		
 		// Everything that we need for the dynamic previews
 		wp_enqueue_script('origin.preview', ORIGIN_BASE_URL.'/js/preview/preview.js', array('jquery'));
 		wp_enqueue_script('origin.color', ORIGIN_BASE_URL.'/js/preview/color.js', array('jquery'));
@@ -326,7 +330,7 @@ function action_wp_enqueue_scripts(){
 	 */
 	function action_admin_bar_menu(){
 		if (!is_super_admin() || !is_admin_bar_showing() || is_admin()) return;
-	
+		
 		$href= add_query_arg('page', 'origin', admin_url('/themes.php'));
 
 		if(!is_admin() && !is_404()){
@@ -388,10 +392,11 @@ function filter_pre_set_site_transient_update_themes($checked_data){
 
 		$raw_response = wp_remote_post($this->_config->endpoint.'/'.$this->theme_name.'/', $send_for_check);
 
-		if (!is_wp_error($raw_response) && ($raw_response['response']['code'] == 200))
+		if (!is_wp_error($raw_response) && ($raw_response['response']['code'] == 200)){
 			$response = unserialize($raw_response['body']);
+			$checked_data->response[$this->theme_name] = $response;
+		}
 
-		$checked_data->response[$this->theme_name] = $response;
 		return $checked_data;
 	}
 

config.php

@@ -2,4 +2,5 @@
 
 return array(
 	'endpoint' => 'http://192.168.1.102:8888/theme',
+	'path' => 'plugins/origin'
 );

inc/Grid.php

@@ -144,6 +144,9 @@ public function process($html){
 			$tosign[$gi] = array(
 				'id' => $grid_container->getAttribute('id'),
 				'class' => $grid_container->getAttribute('class'),
+				'data-responsive' => $grid_container->getAttribute('data-responsive'),
+				'data-margin' => $grid_container->getAttribute('data-margin'),
+				'data-cell-margin' => $grid_container->getAttribute('data-cell-margin'),
 				'cells' => array()
 			);
 			foreach($grid_container->attributes as $attribute){
@@ -157,7 +160,8 @@ public function process($html){
 
 				$tosign[$gi]['cells'][$ci] = array(
 					'id' => $cell->getAttribute('id'),
-					'class' => $cell->getAttribute('class')
+					'class' => $cell->getAttribute('class'),
+					'data-weight' => $cell->getAttribute('data-weight'),
 				);
 				foreach($cell->attributes as $attribute){
 					if(substr($attribute->name,0,5) == 'data-'){

inc/Image.php

@@ -74,13 +74,17 @@ function register_effect($name, $callback){
 
 	/**
 	 * Get the URL of an attachment preset
+	 *
+	 * @param string $preset The preset name.
+	 * @param int $attachment_id The attachment ID.
+	 * @param string $filename The filename. Can be anything. For SEO purposes.
 	 */
-	function get_preset_url($name, $id, $filename){
+	function get_preset_url($preset, $attachment_id, $filename = 'image.jpg'){
 		global $wp_rewrite;
 
 		if ($wp_rewrite->using_permalinks()){
 			// Return a pretty version
-			return site_url().'/oim/'.urlencode($name).'/'.intval($id).'/'.$filename.'/';
+			return site_url().'/oim/'.urlencode($preset).'/'.intval($attachment_id).'/'.$filename.'/';
 		}
 		else{
 			// TODO Return an ugly version
@@ -161,7 +165,7 @@ function method_preset(){
 
 		$tosign = array(
 			$post->ID,
-			$preset['name']
+			$preset
 		);
 		$file = Origin::single()->cache->get_file('images', $tosign,'jpg');
 

inc/Settings.php

@@ -145,6 +145,7 @@ function save($input = null){
 	 * Load default values for any empty values
 	 */
 	function load_defaults(){
+		if(empty($this->_settings)) return;
 		foreach($this->_settings as $section_id => $section){
 			foreach($section['settings'] as $field_id => $field){
 				if(empty($this->_values[$section_id][$field_id]) && isset($field['default']))

inc/types/pattern.php

@@ -30,9 +30,7 @@ function __construct($section, $name, $settings){
 	 * Enqueue any JS and CSS that we require
 	 */
 	static function enqueue(){
-		wp_enqueue_script('jquery.chosen', ORIGIN_BASE_URL.'/externals/chosen/chosen.jquery.js', array('jquery'));
-		wp_enqueue_style('jquery.chosen', ORIGIN_BASE_URL.'/externals/chosen/chosen.css');
-		wp_enqueue_script('origin.pattern.color', ORIGIN_BASE_URL.'/js/types/pattern.js', array('jquery'));
+		wp_enqueue_script('origin.pattern', ORIGIN_BASE_URL.'/js/types/pattern.js', array('jquery'));
 	}
 
 	function render_form(){