spree_core 0.60.6 → 0.70.RC1

data/{public → app/assets}/javascripts/admin/address_states.js

@@ -14,12 +14,12 @@ var update_state = function(region) {
                 .html(id_nm[1]);
       state_select.append(opt);
     });
-    state_select.removeAttr('disabled').show();;
-    state_input.hide().attr('disabled', 'disabled');
+    state_select.prop("disabled", false).show();
+    state_input.hide().prop("disabled", true);
 
   } else {
-    state_input.removeAttr('disabled').show();
-    state_select.hide().attr('disabled', 'disabled');
+    state_input.prop("disabled", false).show();
+    state_select.hide().prop("disabled", true);
   }
 
 };

data/{public/javascripts/admin.js → app/assets/javascripts/admin/admin.js.erb}

@@ -7,82 +7,35 @@ Hopefully, this will evolve into a propper class.
 var spree;
 if (!spree) spree = {};
 
-jQuery.noConflict() ;
-
-jQuery(document).ajaxStart(function(){
-  jQuery("#progress").slideDown();
+$(document).ajaxStart(function(){
+  $("#progress").slideDown();
 });
 
-jQuery(document).ajaxStop(function(){
-  jQuery("#progress").slideUp();
+$(document).ajaxStop(function(){
+  $("#progress").slideUp();
 });
 
-jQuery.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
+$.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
 // Apply to individual radio button that makes another element visible when checked
-jQuery.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
+$.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   if(!this.get(0)){ return  }
   showValue = this.get(0).value;
   radioGroup = $("input[name='" + this.get(0).name + "']");
   radioGroup.each(function(){
-    jQuery(this).click(function(){
-      jQuery(dependentElementSelector).visible(this.checked && this.value == showValue)
+    $(this).click(function(){
+      $(dependentElementSelector).visible(this.checked && this.value == showValue)
     });
     if(this.checked){ this.click() }
   });
 }
 
-var request = function(options) {
-  jQuery.ajax(jQuery.extend({ dataType: 'script', url: options.url, type: 'get' }, options));
-  return false;
-};
-
-// remote links handler
-jQuery('a[data-remote=true]').live('click', function() {
-  if(confirm_msg = jQuery(this).attr("data-confirm")){
-    if (!confirm(confirm_msg)) return false;
-  }
-  if(method = jQuery(this).attr("data-method")){
-    return request({ url: this.href, type: 'POST', data: {'_method': method} });
-  } else {
-    update_target = jQuery(this).attr("data-update");
-    link_container = jQuery(this).parent();
-    if (update_target) {
-      if ($("#"+update_target).length == 0) {
-        if ($("#"+update_target.replace('_', '-')).length > 0) {
-          update_target = update_target.replace('_', '-')
-        } else {
-          alert("<div id="+update_target+"></div> not found, add it to view to allow AJAX request.");
-          return true;
-        }
-      }
-    }
-    jQuery.ajax({ dataType: 'script', url: this.href, type: 'get',
-        success: function(data){
-          if (update_target) {
-            $("#"+update_target).html(data);
-            link_container.hide();
-          }
-        }
-    });
-    return false;
-  }
-});
-
-// remote forms handler
-jQuery('form[data-remote=true]').live('submit', function() {
-  return request({ url : this.action, type : this.method, data : jQuery(this).serialize() });
-});
-
-
-
-
 // Product autocompletion
 image_html = function(item){
-  return "<img src='/assets/products/" + item['images'][0]["id"] + "/mini/" + item['images'][0]['attachment_file_name'] + "'/>";
+  return "<img src='" + item['images'][0]["mini_url"] + "'/>";
 }
 
-format_autocomplete = function(data){
+format_product_autocomplete = function(data){
   var html = "";
 
   var product = data['product'];
@@ -119,17 +72,15 @@ format_autocomplete = function(data){
     html += "<span><strong>On Hand: </strong>" + variant['count_on_hand'] + "</span></div>";
   }
 
-
   return html
 }
 
-
-prep_autocomplete_data = function(data){
+prep_product_autocomplete_data = function(data){
   return $.map(eval(data), function(row) {
 
     var product = row['product'];
 
-    if(product['variants'].length>0 && expand_variants){
+    if(product['variants'].length>0 && ['expand_variants']){
       //variants
       return $.map(product['variants'], function(variant){
 
@@ -154,11 +105,11 @@ prep_autocomplete_data = function(data){
   });
 }
 
-jQuery.fn.product_autocomplete = function(){
-  $(this).autocomplete("/admin/products.json?authenticity_token=" + $('meta[name=csrf-token]').attr("content"), {
-      parse: prep_autocomplete_data,
+$.fn.product_autocomplete = function(){
+  $(this).autocomplete("/admin/products.json?authenticity_token=" + escape($('meta[name=csrf-token]').attr("content")), {
+      parse: prep_product_autocomplete_data,
       formatItem: function(item) {
-        return format_autocomplete(item);
+        return format_product_autocomplete(item);
       }
     }).result(function(event, data, formatted) {
       if (data){
@@ -173,10 +124,8 @@ jQuery.fn.product_autocomplete = function(){
     });
 }
 
-
-
-jQuery.fn.objectPicker = function(url){
-  jQuery(this).tokenInput(url + "&authenticity_token=" + AUTH_TOKEN, {
+$.fn.objectPicker = function(url){
+  $(this).tokenInput(url + "&authenticity_token=" + escape(AUTH_TOKEN), {
     searchDelay          : 600,
     hintText             : strings.type_to_search,
     noResultsText        : strings.no_results,
@@ -185,48 +134,96 @@ jQuery.fn.objectPicker = function(url){
   });
 };
 
-jQuery.fn.productPicker = function(){
-  jQuery(this).objectPicker(ajax_urls.product_search_basic_json);
+$.fn.productPicker = function(){
+  $(this).objectPicker(ajax_urls.product_search_basic_json);
 }
-jQuery.fn.userPicker = function(){
-  jQuery(this).objectPicker(ajax_urls.user_search_basic_json);
+$.fn.userPicker = function(){
+  $(this).objectPicker(ajax_urls.user_search_basic_json);
 }
 
-jQuery(document).ready(function() {
-
-  jQuery('.tokeninput.products').productPicker();
-  jQuery('.tokeninput.users').userPicker();
-
-});
-
-function add_fields(target, association, content) {
+// Possible defunct
+add_fields = function(target, association, content) {
   var new_id = new Date().getTime();
   var regexp = new RegExp("new_" + association, "g");
   $(target).append(content.replace(regexp, new_id));
 }
 
-jQuery('a.remove_fields').live('click', function() {
+$('a.remove_fields').live('click', function() {
   $(this).prev("input[type=hidden]").val("1");
   $(this).closest(".fields").hide();
   return false;
 });
 
-jQuery(".observe_field").live('change', function() {
+$(".observe_field").live('change', function() {
   target = $(this).attr("data-update");
   ajax_indicator = $(this).attr("data-ajax-indicator") || '#busy_indicator';
   $(target).hide();
   $(ajax_indicator).show();
-  $.get($(this).attr("data-base-url")+encodeURIComponent($(this).val()),
-    function(data) {
-      $(target).html(data);
-      $(ajax_indicator).hide();
-      $(target).show();
-    }
-  );
+  $.ajax({ dataType: 'html',
+           url: $(this).attr("data-base-url")+encodeURIComponent($(this).val()),
+           type: 'get',
+           success: function(data){
+             $(target).html(data);
+             $(ajax_indicator).hide();
+             $(target).show();
+           }
+  });
 });
 
-jQuery(document).ready(function() {
-  $('div.alert a.dismiss').click(function() {
-    $(this).parent().fadeOut();
+handle_date_picker_fields = function(){
+  $('.datepicker').datepicker({
+    dateFormat: 'yy/mm/dd',
+    showOn: "button",
+    buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
+    buttonImageOnly: true
   });
+}
+
+$(document).ready(function(){
+
+  $('.tokeninput.products').productPicker();
+  $('.tokeninput.users').userPicker();
+
+  handle_date_picker_fields();
+
+  $(".select_properties_from_prototype").live("click", function(){
+    $("#busy_indicator").show();
+    var clicked_link = $(this);
+    $.ajax({ dataType: 'script', url: clicked_link.attr("href"), type: 'get',
+        success: function(data){
+          clicked_link.parent("td").parent("tr").hide();
+          $("#busy_indicator").hide();
+        }
+    });
+    return false;
+  });
+
+
+  $('table.sortable').ready(function(){
+    $('table.sortable tbody').sortable(
+      {
+        handle: '.handle',
+        update: function(event, ui) {
+          $("#progress").show();
+          positions = {};
+          type = '';
+          $.each($('table.sortable tbody tr'), function(position, obj){
+            reg = /(\w+_?)+_(\d+)/;
+            parts = reg.exec($(obj).attr('id'));
+            if (parts) { 
+              positions['positions['+parts[2]+']'] = position;
+              type = parts[1];
+            }
+          });
+          $.ajax({
+            type: 'POST',
+            dataType: 'script',
+            url: type+'s/update_positions',
+            data: positions,
+            success: function(data){ $("#progress").hide(); }
+          });
+        }
+      });
+  });
+
 });