spree_core 1.2.5 → 1.3.0.rc1

data/app/assets/javascripts/admin/address_states.js

@@ -1,9 +1,9 @@
 var update_state = function(region) {
-  var country        = $('span#' + region + 'country :only-child').val();
+  var country        = $('span#' + region + 'country .select2').select2('val');
   var states         = state_mapper[country];
 
-  var state_select = $('span#' + region + 'state select');
-  var state_input = $('span#' + region + 'state input');
+  var state_select   = $('span#' + region + 'state .select2');
+  var state_input    = $('span#' + region + 'state input');
 
   if(states) {
     state_select.html('');
@@ -15,11 +15,12 @@ var update_state = function(region) {
       state_select.append(opt);
     });
     state_select.prop("disabled", false).show();
+    state_select.select2();
     state_input.hide().prop("disabled", true);
 
   } else {
     state_input.prop("disabled", false).show();
-    state_select.hide().prop("disabled", true);
+    state_select.select2('destroy').hide();
   }
 
 };

data/app/assets/javascripts/admin/admin.js.erb

@@ -1,8 +1,7 @@
-//<%#encoding: UTF-8%>
 //= require_self
-//= require admin/product_autocomplete
+//= require admin/variant_autocomplete
 //= require admin/taxon_autocomplete
-//= require select2
+//= require admin/spree-select2
 
 /**
 This is a collection of javascript functions and whatnot
@@ -10,14 +9,77 @@ under the spree namespace that do stuff we find helpful.
 Hopefully, this will evolve into a propper class.
 **/
 
-$(document).ajaxStart(function(){
-  $("#progress").slideDown();
-});
+jQuery(function($) {
+  // Make main menu use full width
+  $('.fullwidth-menu').horizontalNav({
+    tableDisplay: false,
+    responsiveDelay: 0
+  });
+
+  // Vertical align of checkbox fields
+  $('.field.checkbox label').vAlign()
+
+  <% # Re-adjusting admin menu during test causes tests to fail,
+     # like states_spec and shipping_methods_spec. Let's not do this. %>
+  <% unless Rails.env.test? %>
+    $('.main-menu-wrapper ul').AdaptiveMenu({
+      text: "<a href='#'><i class='icon-chevron-down'></i> " + Spree.translations.more + "</a>",
+      klass: "dropdown"
+    });
+  <% end %>
+
+  // Add some tips
+  $('.with-tip').powerTip({
+    smartPlacement: true,
+    fadeInTime: 50,
+    fadeOutTime: 50,
+    intentPollInterval: 300
+  });
+
+  $('.with-tip').on({
+    powerTipPreRender: function(){
+      $('#powerTip').addClass($(this).attr("data-action"));
+      $('#powerTip').addClass($(this).attr("data-tip-color"));
+    },
+    powerTipClose: function(){
+      $('#powerTip').removeClass($(this).attr("data-action"))
+    }
+  });
+
+  // Make flash messages dissapear
+  setTimeout('$(".flash").fadeOut()', 5000);
+
+  // Highlight hovered table column
+  $('table tbody tr td.actions a').hover(function(){
+    var tr = $(this).closest('tr');
+    var klass = 'highlight action-' + $(this).attr('data-action')
+    tr.addClass(klass)
+    tr.prev().addClass('before-' + klass);
+  }, function(){
+    var tr = $(this).closest('tr');
+    var klass = 'highlight action-' + $(this).attr('data-action')
+    tr.removeClass(klass)
+    tr.prev().removeClass('before-' + klass);
+  });
+
+  // Trunkate text in page_title that didn't fit
+  var truncate_elements = $('.truncate');
+
+  truncate_elements.each(function(){
+    $(this).trunk8();
+  });
+  $(window).resize(function (event) {
+    truncate_elements.each(function(){
+      $(this).trunk8();
+    })
+  });
+
+  // Make height of dt/dd elements the same
+  $("dl").equalize('outerHeight');
 
-$(document).ajaxStop(function(){
-  $("#progress").slideUp();
 });
 
+
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
 show_flash_error = function(message) {
@@ -47,21 +109,6 @@ $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   });
 }
 
-
-$.fn.objectPicker = function(url){
-  $(this).tokenInput(url + "&authenticity_token=" + escape(AUTH_TOKEN), {
-    searchDelay          : 600,
-    hintText             : Spree.translations.type_to_search,
-    noResultsText        : Spree.translations.no_results,
-    searchingText        : Spree.translations.searching,
-    prePopulateFromInput : true
-  });
-};
-
-$.fn.productPicker = function(){
-  $(this).objectPicker(Spree.routes.product_search_basic);
-}
-
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
     dateFormat: Spree.translations.date_picker,
@@ -70,9 +117,15 @@ handle_date_picker_fields = function(){
     monthNames: Spree.translations.month_names, 
     prevText: Spree.translations.previous,
     nextText: Spree.translations.next,
-    showOn: "button",
-    buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
-    buttonImageOnly: true
+    showOn: "focus"
+  });
+
+  // Correctly display range dates
+  $('.date-range-filter .datepicker-from').datepicker('option', 'onSelect', function(selectedDate) {
+    $(".date-range-filter .datepicker-to" ).datepicker( "option", "minDate", selectedDate );
+  });
+  $('.date-range-filter .datepicker-to').datepicker('option', 'onSelect', function(selectedDate) {
+    $(".date-range-filter .datepicker-from" ).datepicker( "option", "maxDate", selectedDate );
   });
 }
 
@@ -104,14 +157,7 @@ $(document).ready(function(){
       el.attr("id", el.attr("id").replace(/\d+/, new_id))
       el.attr("name", el.attr("name").replace(/\d+/, new_id))
     })
-    // When cloning a new row, set the href of all icons to be an empty "#"
-    // This is so that clicking on them does not perform the actions for the
-    // duplicated row
-    new_table_row.find("a").each(function () {
-      var el = $(this);
-      el.attr('href', '#');
-    })
-    $(target).append(new_table_row);
+    $(target).prepend(new_table_row);
   })
 
   $('body').on('click', '.delete-resource', function() {
@@ -137,31 +183,11 @@ $(document).ready(function(){
   });
 
   $('body').on('click', 'a.remove_fields', function() {
-    el = $(this);
-    el.prev("input[type=hidden]").val("1");
-    el.closest(".fields").hide();
-    if (el.attr("href")) {
-      $.ajax({
-        type: 'POST',
-        url: el.attr("href"),
-        data: { 
-          _method: 'delete',
-          authenticity_token: AUTH_TOKEN
-        },
-        success: function(response) {
-          el.parents("tr").fadeOut('hide');
-        },
-        error: function(response, textStatus, errorThrown) {
-          show_flash_error(response.responseText);
-        }
-
-      })
-    }
+    $(this).prev("input[type=hidden]").val("1");
+    $(this).closest(".fields").hide();
     return false;
   });
 
-  $('.tokeninput.products').productPicker();
-
   $('body').on('click', '.select_properties_from_prototype', function(){
     $("#busy_indicator").show();
     var clicked_link = $(this);
@@ -174,11 +200,21 @@ $(document).ready(function(){
     return false;
   });
 
+  // Fix sortable helper
+  var fixHelper = function(e, ui) {
+      ui.children().each(function() {
+          $(this).width($(this).width());
+      });
+      return ui;
+  };
 
   $('table.sortable').ready(function(){
+    var td_count = $(this).find('tbody tr:first-child td').length
     $('table.sortable tbody').sortable(
       {
         handle: '.handle',
+        helper: fixHelper,
+        placeholder: 'ui-sortable-placeholder',
         update: function(event, ui) {
           $("#progress").show();
           positions = {};
@@ -195,9 +231,21 @@ $(document).ready(function(){
             url: $(ui.item).closest("table.sortable").data("sortable-link"),
             data: positions,
             success: function(data){ $("#progress").hide(); }
-          });
+          });                    
+        },
+        start: function (event, ui) {          
+          // Set correct height for placehoder (from dragged tr)
+          ui.placeholder.height(ui.item.height())
+          // Fix placeholder content to make it correct width
+          ui.placeholder.html("<td colspan='"+(td_count-1)+"'></td><td class='actions'></td>")
+        },
+        stop: function (event, ui) {
+          // Fix odd/even classes after reorder
+          $("table.sortable tr:even").removeClass("odd even").addClass("even");
+          $("table.sortable tr:odd").removeClass("odd even").addClass("odd");
         }
-      });
+
+      }).disableSelection();
   });
 
   $('a.dismiss').click(function() {

data/app/assets/javascripts/admin/calculator.js

@@ -6,11 +6,11 @@ $(function() {
     if (calculator_select.attr('value') == original_calc_type) {
       $('div.calculator-settings').show();
       $('div#calculator-settings-warning').hide();
-      $('.calculator-settings').find('input,textarea').prop("disabled", false);
+      $('.calculator-settings input').prop("disabled", false);
     } else {
       $('div.calculator-settings').hide();
       $('div#calculator-settings-warning').show();
-      $('.calculator-settings').find('input,textarea').prop("disabled", true);
+      $('.calculator-settings input').prop("disabled", true);
     }
   });
 })

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -35,9 +35,9 @@ $(document).ready(function(){
   prep_user_autocomplete_data = function(data){
     return $.map(eval(data['users']), function(row) {
       return {
-          data: row['user'],
-          value: row['user']['email'],
-          result: row['user']['email']
+          data: row,
+          value: row['email'],
+          result: row['email']
       }
     });
   }
@@ -49,7 +49,7 @@ $(document).ready(function(){
       source: function(request, response) {
         var params = { q: $('#customer_search').val(),
                        authenticity_token: AUTH_TOKEN }
-        $.get(Spree.routes.user_search + '?' + jQuery.param(params), function(data) {
+        $.get(Spree.routes.user_search + '&' + jQuery.param(params), function(data) {
           result = prep_user_autocomplete_data(data)
           response(result);
         });
@@ -89,7 +89,7 @@ $(document).ready(function(){
       html = format_user_autocomplete(item);
       return $("<li></li>")
               .data("item.autocomplete", item)
-              .append("<a>" + html + "</a>")
+              .append("<a class='ui-menu-item'>" + html + "</a>")
               .appendTo(ul);
     }
 

data/app/assets/javascripts/admin/image_settings.js.erb

@@ -0,0 +1,62 @@
+$(document).ready(function() {
+
+  if ($('input#preferences_use_s3[type="checkbox"]:checked').length > 0) {
+    $('#s3_settings, #s3_headers').show();
+  }
+
+  // Toggle display of S3 settings based on value of use_s3 checkbox
+  $('input#preferences_use_s3[type="checkbox"]').click(function() {
+    $('#s3_settings, #s3_headers').toggle();
+  });
+
+  $('.destroy_style').live("click", function(e) {
+    e.preventDefault();
+    $(this).parent().remove();
+  });
+
+  $('.destroy_new_attachment_styles').live("click", function(e) {
+    e.preventDefault();
+    $(this).closest('.new_attachment_styles').remove();
+  });
+
+  $('.destroy_new_s3_headers').live("click", function(e) {
+    e.preventDefault();
+    $(this).closest('.new_s3_headers').remove();
+  });
+
+  // Handle adding new styles
+  var styles_hash_index = 1;
+  $('.add_new_style').live("click", function(e) {
+    e.preventDefault();
+    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
+  });
+
+  // Handle adding new headers
+  var headers_hash_index = 1;
+  $('.add_header').live("click", function(e) {
+    e.preventDefault();
+    $('#headers_list').append(generate_html_for_hash("new_s3_headers", headers_hash_index));
+  });
+
+  // Generates html for new paperclip styles form fields
+  generate_html_for_hash = function(hash_name, index) {
+    var html = '<div class="' + hash_name + ' row"><div class="field">';
+    html += '<div class="five columns">';
+    html += '<label for="' + hash_name + '_' + index + '_name">';
+    html += Spree.translations.name + '</label>';
+    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text" class="fullwidth"><br>';
+    html += '</div><div class="five columns">'
+    html += '<label for="' + hash_name + '_' + index + '_value">';
+    html += Spree.translations.value + '</label>';
+    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text" class="fullwidth">';
+    html += '</div><div class="two columns">'
+    html += '<a href="#" title="' + Spree.translations.destroy + '" class="destroy_' + hash_name + ' with-tip button" style="margin-top: 19px;"><i class="icon-trash"></i> &nbsp; ' + Spree.translations.destroy + '</a>';
+    html += '</div></div></div>';
+
+    index += 1;
+    return html;
+  };
+
+
+
+});

data/app/assets/javascripts/admin/images/index.js.coffee

@@ -1,6 +1,9 @@
 $ ->
   ($ '#new_image_link').click (event) ->
     event.preventDefault()
+
+    ($ '.no-objects-found').hide()
+
     ($ this).hide()
     $.ajax
       type: 'GET'

data/app/assets/javascripts/admin/images/new.js.coffee

@@ -1,4 +1,7 @@
 ($ '#cancel_link').click (event) ->
   event.preventDefault()
+
+  ($ '.no-objects-found').show()
+
   ($ '#new_image_link').show()
   ($ '#images').html('')

data/app/assets/javascripts/admin/orders/edit.js

@@ -10,6 +10,6 @@ $(document).ready(function(){
     return false;
   });
 
-  $(".product_autocomplete").product_autocomplete();
+  $(".variant_autocomplete").variantAutocomplete();
 
 });

data/app/assets/javascripts/admin/progress.coffee

@@ -0,0 +1,27 @@
+$(document).ready ->
+  opts =
+    lines: 11
+    length: 2
+    width: 3
+    radius: 9
+    corners: 1
+    rotate: 0
+    color: '#fff'
+    speed: 0.8
+    trail: 48
+    shadow: false
+    hwaccel: true
+    className: 'spinner'
+    zIndex: 2e9
+    top: 'auto'
+    left: 'auto'
+
+  target = document.getElementById("spinner")  
+
+  $(document).ajaxStart ->
+    $("#progress").fadeIn()
+    spinner = new Spinner(opts).spin(target)    
+
+  $(document).ajaxStop ->
+    $("#progress").fadeOut()    
+

data/app/assets/javascripts/admin/shipping_methods.js.coffee

@@ -1,5 +1,5 @@
 $ ->
-  ($ 'fieldset.categories input[type=checkbox]:not(:checked)').attr 'disabled', true  if ($ '.categories input:checked').length > 0
+  ($ 'input[type=checkbox]:not(:checked)').attr 'disabled', true  if ($ '.categories input:checked').length > 0
   categoryCheckboxes = '.categories input[type=checkbox]'
   $(categoryCheckboxes).change ->
     if ($ this).is(':checked')

data/app/assets/javascripts/admin/spree-select2.js.erb

@@ -0,0 +1,24 @@
+//= require select2
+jQuery(function($) {
+  <% unless Rails.env.test? %>
+    // Make select beautiful
+    $('select.select2').select2({
+      allowClear: true
+    });
+
+    function format_taxons(taxon) {
+      new_taxon = taxon.text.replace('->', '<i class="icon-arrow-right">')
+      return new_taxon;
+    }
+
+    $("#product_taxon_ids").on({
+      change: function(e){
+        $('.select2-search-choice .with-tip').powerTip({
+          smartPlacement: true,
+          fadeInTime: 50,
+          fadeOutTime: 50
+        })
+      }
+    })
+  <% end %>
+})