spree_backend 4.1.12 → 4.2.0.rc3

data/app/assets/javascripts/spree/backend/taxon_autocomplete.js

@@ -1,52 +1,39 @@
-'use strict'
-// eslint-disable-next-line camelcase
-function set_taxon_select (selector) {
-  function formatTaxon (taxon) {
-    return Select2.util.escapeMarkup(taxon.pretty_name)
+$.fn.taxonAutocomplete = function() {
+  'use strict'
+
+  function formatTaxonList(values) {
+    return values.map(function (obj) {
+      return {
+        id: obj.id,
+        text: obj.pretty_name
+      }
+    })
   }
 
-  if ($(selector).length > 0) {
-    $(selector).select2({
-      placeholder: Spree.translations.taxon_placeholder,
-      multiple: true,
-      initSelection: function (element, callback) {
-        var url = Spree.url(Spree.routes.taxons_api, {
-          ids: element.val(),
-          without_children: true,
+  this.select2({
+    multiple: true,
+    placeholder: Spree.translations.taxon_placeholder,
+    minimumInputLength: 2,
+    ajax: {
+      url: Spree.routes.taxons_api,
+      dataType: 'json',
+      data: function (params) {
+        return {
+          q: {
+            name_cont: params.term,
+          },
           token: Spree.api_key
-        })
-        return $.getJSON(url, null, function (data) {
-          return callback(data['taxons'])
-        })
-      },
-      ajax: {
-        url: Spree.routes.taxons_api,
-        datatype: 'json',
-        data: function (term, page) {
-          return {
-            per_page: 50,
-            page: page,
-            without_children: true,
-            q: {
-              name_cont: term
-            },
-            token: Spree.api_key
-          }
-        },
-        results: function (data, page) {
-          var more = page < data.pages
-          return {
-            results: data['taxons'],
-            more: more
-          }
         }
       },
-      formatResult: formatTaxon,
-      formatSelection: formatTaxon
-    })
-  }
+      processResults: function(data) {
+        return {
+          results: formatTaxonList(data.taxons)
+        }
+      }
+    }
+  })
 }
 
 $(document).ready(function () {
-  set_taxon_select('#product_taxon_ids')
+  $('#product_taxon_ids').taxonAutocomplete()
 })

data/app/assets/javascripts/spree/backend/taxon_tree_menu.js

@@ -6,26 +6,26 @@ root.taxon_tree_menu = function (obj, context) {
   editUrl.setPath(editUrl.path() + '/' + obj.attr('id') + '/edit')
   return {
     create: {
-      label: '<span class="icon icon-plus"></span> ' + Spree.translations.add,
+      label: '<i class="icon icon-add"></i>' + Spree.translations.add,
       action: function (obj) {
         return context.create(obj)
       }
     },
     rename: {
-      label: '<span class="icon icon-pencil"></span> ' + Spree.translations.rename,
+      label: '<i class="icon icon-edit"></i> ' + Spree.translations.rename,
       action: function (obj) {
         return context.rename(obj)
       }
     },
     remove: {
-      label: '<span class="icon icon-trash"></span> ' + Spree.translations.remove,
+      label: '<i class="icon icon-delete"></i> ' + Spree.translations.remove,
       action: function (obj) {
         return context.remove(obj)
       }
     },
     edit: {
       separator_before: true,
-      label: '<span class="icon icon-cog"></span> ' + Spree.translations.edit,
+      label: '<i class="icon icon-settings"></i> ' + Spree.translations.edit,
       action: function () {
         window.location = editUrl.toString()
         return window.location

data/app/assets/javascripts/spree/backend/taxonomy.js

@@ -158,9 +158,16 @@ root.setup_taxonomy_tree = function (taxonomyId) {
         return $(this).jstree('core').toggle_node($('.jstree-icon').first())
       })
     })
+
     $taxonomyTree.on('dblclick', 'a', function () {
-      $taxonomyTree.jstree('rename', this)
+      var iOS = /iPad|iPhone|iPod/.test(navigator.platform || '')
+      if (iOS) {
+        $taxonomyTree.jstree('show_contextmenu', this)
+      } else {
+        $taxonomyTree.jstree('rename', this)
+      }
     })
+
     // suppress form submit on enter/return
     $(document).keypress(function (event) {
       if (event.keyCode === 13) {

data/app/assets/javascripts/spree/backend/taxons.js

@@ -1,96 +1,106 @@
-/* global productTemplate */
+/* global productTemplate, Sortable */
 $(function () {
   window.productTemplate = Handlebars.compile($('#product_template').text())
   var taxonProducts = $('#taxon_products')
   var taxonId = $('#taxon_id')
 
-  taxonProducts.sortable({
-    handle: '.js-sort-handle'
-  })
-
-  taxonProducts.on('sortstop', function (event, ui) {
-    return $.ajax({
-      url: Spree.routes.classifications_api,
-      method: 'PUT',
-      dataType: 'json',
-      data: {
-        token: Spree.api_key,
-        product_id: ui.item.data('product-id'),
-        taxon_id: $('#taxon_id').val(),
-        position: ui.item.index()
+  var el = document.getElementById('taxon_products')
+  if (el) {
+    Sortable.create(el, {
+      handle: '.sort-handle',
+      ghostClass: 'moving-this',
+      animation: 550,
+      easing: 'cubic-bezier(1, 0, 0, 1)',
+      swapThreshold: 0.9,
+      forceFallback: true,
+      onEnd: function (evt) {
+        var itemEl = evt.item.getAttribute('data-product-id')
+        var newin = evt.newIndex
+        return $.ajax({
+          url: Spree.routes.classifications_api,
+          method: 'PUT',
+          dataType: 'json',
+          data: {
+            token: Spree.api_key,
+            product_id: itemEl,
+            taxon_id: $('#taxon_id').val(),
+            position: newin
+          }
+        })
       }
     })
-  })
+  }
 
   if (taxonId.length > 0) {
     taxonId.select2({
-      dropdownCssClass: 'taxon_select_box',
       placeholder: Spree.translations.find_a_taxon,
+      minimumInputLength: 3,
+      multiple: false,
       ajax: {
         url: Spree.routes.taxons_api,
         datatype: 'json',
-        data: function (term, page) {
+        data: function (params, page) {
           return {
             per_page: 50,
             page: page,
             without_children: true,
-            token: Spree.api_key,
             q: {
-              name_cont: term
-            }
+              name_cont: params.term
+            },
+            token: Spree.api_key
           }
         },
-        results: function (data, page) {
+        processResults: function (data, page) {
           var more = page < data.pages
+          var results = formatTaxonList(data.taxons)
+
           return {
-            results: data['taxons'],
-            more: more
+            results: results,
+            pagination: {
+              more: more
+            }
           }
         }
       },
-      formatResult: formatTaxon,
-      formatSelection: formatTaxon
-    })
-  }
-
-  taxonId.on('change', function (e) {
-    var el = $('#taxon_products')
-    $.ajax({
-      url: Spree.routes.taxon_products_api,
-      data: {
-        id: e.val,
-        token: Spree.api_key
-      }
-    }).done(function (data) {
-      var i, j, len, len1, product, ref, ref1, results, variant
-      el.empty()
-      if (data.products.length === 0) {
-        return $('#taxon_products').html('<div class="alert alert-info">' + Spree.translations.no_results + '</div>')
-      } else {
-        ref = data.products
-        results = []
-        for (i = 0, len = ref.length; i < len; i++) {
-          product = ref[i]
-          if (product.master.images[0] !== void 0 && product.master.images[0].small_url !== void 0) {
-            product.image = product.master.images[0].small_url
-          } else {
-            ref1 = product.variants
-            for (j = 0, len1 = ref1.length; j < len1; j++) {
-              variant = ref1[j]
-              if (variant.images[0] !== void 0 && variant.images[0].small_url !== void 0) {
-                product.image = variant.images[0].small_url
-                break
+      templateResult: formatTaxon,
+      templateSelection: formatTaxon
+    }).on('select2:select', function (e) {
+      var el = $('#taxon_products')
+      $.ajax({
+        url: Spree.routes.taxon_products_api,
+        data: { id: e.params.data.id, token: Spree.api_key }
+      }).done(function (data) {
+        var i, j, len, len1, product, ref, ref1, results, variant
+        el.empty()
+        if (data.products.length === 0) {
+          return $('#taxon_products').html('<div class="alert alert-info">' + Spree.translations.no_results + '</div>')
+        } else {
+          ref = data.products
+          results = []
+          for (i = 0, len = ref.length; i < len; i++) {
+            product = ref[i]
+            if (product.master.images[0] !== void 0 && product.master.images[0].small_url !== void 0) {
+              product.image = product.master.images[0].small_url
+            } else {
+              ref1 = product.variants
+              for (j = 0, len1 = ref1.length; j < len1; j++) {
+                variant = ref1[j]
+                if (variant.images[0] !== void 0 && variant.images[0].small_url !== void 0) {
+                  product.image = variant.images[0].small_url
+                  break
+                }
               }
             }
+            results.push(el.append(productTemplate({
+              product: product
+            })))
           }
-          results.push(el.append(productTemplate({
-            product: product
-          })))
+          return results
         }
-        return results
-      }
+      })
     })
-  })
+  }
+
   taxonProducts.on('click', '.js-delete-product', function (e) {
     var currentTaxonId = $('#taxon_id').val()
     var product = $(this).parents('.product')
@@ -117,6 +127,18 @@ $(function () {
   $('.variant_autocomplete').variantAutocomplete()
 
   function formatTaxon (taxon) {
-    return Select2.util.escapeMarkup(taxon.pretty_name)
+    if (taxon.loading) {
+      return taxon.text;
+    }
+    return taxon.pretty_name
+  }
+
+  function formatTaxonList(values) {
+    return values.map(function (obj) {
+      return {
+        id: obj.id,
+        pretty_name: obj.pretty_name
+      }
+    })
   }
 })

data/app/assets/javascripts/spree/backend/user_picker.js

@@ -1,40 +1,38 @@
 $.fn.userAutocomplete = function () {
   'use strict'
 
-  function formatUser (user) {
-    return Select2.util.escapeMarkup(user.email)
+  function formatUserList(values) {
+    return values.map(function (obj) {
+      return {
+        id: obj.id,
+        text: obj.email
+      }
+    })
   }
 
   this.select2({
-    minimumInputLength: 1,
     multiple: true,
-    initSelection: function (element, callback) {
-      $.get(Spree.routes.users_api, {
-        ids: element.val().split(','),
-        token: Spree.api_key
-      }, function (data) {
-        callback(data.users)
-      })
-    },
+    minimumInputLength: 1,
     ajax: {
       url: Spree.routes.users_api,
-      datatype: 'json',
-      data: function (term) {
+      dataType: 'json',
+      data: function (params) {
         return {
           q: {
-            email_cont: term
+            email_start: params.term
           },
           token: Spree.api_key
         }
       },
-      results: function (data) {
+      processResults: function(data) {
         return {
-          results: data.users
+          results: formatUserList(data.users)
         }
       }
     },
-    formatResult: formatUser,
-    formatSelection: formatUser
+    templateSelection: function (data) {
+      return data.text
+    }
   })
 }
 

data/app/assets/javascripts/spree/backend/variant_autocomplete.js

@@ -9,53 +9,54 @@ $(function () {
   }
 })
 
-function formatVariantResult (variant) {
+function formatVariantResult(variant) {
+  if (variant.loading) {
+    return variant.text
+  }
+
   if (variant['images'][0] !== undefined && variant['images'][0].mini_url !== undefined) {
     variant.image = variant.images[0].mini_url
   }
-  return variantTemplate({
+  return $(variantTemplate({
     variant: variant
-  })
+  }))
 }
 
 $.fn.variantAutocomplete = function () {
+
+  // deal with initSelection
   return this.select2({
     placeholder: Spree.translations.variant_placeholder,
     minimumInputLength: 3,
-    initSelection: function (element, callback) {
-      return $.get(Spree.routes.variants_api + '/' + element.val(), {
-        token: Spree.api_key
-      }).done(function (data) {
-        return callback(data)
-      })
-    },
+    quietMillis: 200,
     ajax: {
       url: Spree.url(Spree.routes.variants_api),
-      quietMillis: 200,
-      datatype: 'json',
-      data: function (term) {
-        return {
+      dataType: 'json',
+      data: function (params) {
+        var query = {
           q: {
-            product_name_or_sku_cont: term
+            search_by_product_name_or_sku: params.term
           },
           token: Spree.api_key
         }
+
+        return query;
       },
-      results: function (data) {
+      processResults: function(data) {
         window.variants = data['variants']
         return {
-          results: data['variants']
+          results: data.variants
         }
       }
     },
-    formatResult: formatVariantResult,
-    formatSelection: function (variant) {
-      // eslint-disable-next-line no-extra-boolean-cast
+    templateResult: formatVariantResult,
+    templateSelection: function(variant) {
       if (!!variant.options_text) {
-        return Select2.util.escapeMarkup(variant.name + '(' + variant.options_text + ')')
+        return variant.name + '(' + variant.options_text + ')'
       } else {
-        return Select2.util.escapeMarkup(variant.name)
+        return variant.name
       }
     }
   })
+
 }