spree_core 3.3.0.rc2 → 3.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 233dee0431dd5bf0e9ed17b562f2cdc4319ed57b
-  data.tar.gz: 7d4f772e323db20a0a0f786c493047ba6af720dc
+  metadata.gz: c6668d5ee08583dde8ee30f6c7de79e62a5b6084
+  data.tar.gz: 5d31cd7cae134239c4768c9e107c129a9702ffd2
 SHA512:
-  metadata.gz: 9bb2478b50519381c872f5ff3954edf622e6ee16a289c1570dc413341f683b85d87819a7cccb393481d4471544be96b9ee19fe2f7221bf05dc945938d1a343a5
-  data.tar.gz: 4dcb5617c69eada1bb9a869237643316a3fc1c349f05a966b38c7199464287f7f288088b594807ddf0fe01e58e236132d02a053f21155717f1a87e7ac96ee7e5
+  metadata.gz: 3edae0e8a5070fe74583a4f33b45689340943661e7bb16bef1ff2d09604aa90736be587367c0bbfc8d063132dabca53aaf48f98e631e50857f2b67b4bb2570a4
+  data.tar.gz: a029305f8e34985aecf4a4f2641c8d1e5401366501d765d2f83fa5053e743ca7ea99ca27e93e0a037ae5d68b72db27c433d2950b4e0f516ce0d308a169d610fe

data/app/models/spree/order.rb

@@ -618,6 +618,10 @@ module Spree
     end
     alias_method :fully_discounted, :fully_discounted?
 
+    def promo_code
+      promotions.pluck(:code).compact.first
+    end
+
     private
 
     def link_by_email

data/app/models/spree/payment_method/store_credit.rb

@@ -117,7 +117,7 @@ module Spree
 
     def handle_action(action, action_name, auth_code)
       # Find first event with provided auth_code
-      store_credit = StoreCreditEvent.find_by_authorization_code(auth_code).try(:store_credit)
+      store_credit = StoreCreditEvent.find_by(authorization_code: auth_code).try(:store_credit)
 
       if store_credit.nil?
         ActiveMerchant::Billing::Response.new(

data/app/models/spree/preferences/store.rb

@@ -40,7 +40,7 @@ module Spree::Preferences
         # has been cleared from the cache
 
         # does it exist in the database?
-        if preference = Spree::Preference.find_by_key(key)
+        if preference = Spree::Preference.find_by(key: key)
           # it does exist
           val = preference.value
         else
@@ -81,7 +81,7 @@ module Spree::Preferences
     def destroy(cache_key)
       return unless should_persist?
 
-      preference = Spree::Preference.find_by_key(cache_key)
+      preference = Spree::Preference.find_by(key: cache_key)
       preference.destroy if preference
     end
 

data/app/models/spree/store_credit.rb

@@ -248,7 +248,7 @@ module Spree
     def associate_credit_type
       unless type_id
         credit_type_name = category.try(:non_expiring?) ? 'Non-expiring' : 'Expiring'
-        self.credit_type = Spree::StoreCreditType.find_by_name(credit_type_name)
+        self.credit_type = Spree::StoreCreditType.find_by(name: credit_type_name)
       end
     end
   end

data/app/models/spree/store_credit_event.rb

@@ -32,7 +32,7 @@ module Spree
     end
 
     def order
-      Spree::Payment.find_by_response_code(authorization_code).try(:order)
+      Spree::Payment.find_by(response_code: authorization_code).try(:order)
     end
   end
 end

data/app/models/spree/tracker.rb

@@ -1,19 +1,25 @@
 module Spree
   class Tracker < Spree::Base
+    TRACKING_ENGINES = %i(google_analytics segment).freeze
+    enum engine: TRACKING_ENGINES
+
     after_commit :clear_cache
 
-    validates :analytics_id, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+    validates :analytics_id, presence: true, uniqueness: { scope: :engine, case_sensitive: false }
+
+    scope :active, -> { where(active: true) }
 
-    def self.current
-      tracker = Rails.cache.fetch("current_tracker") do
-        where(active: true).first
+    def self.current(engine = TRACKING_ENGINES.first)
+      tracker = Rails.cache.fetch("current_tracker/#{engine}") do
+        send(engine).active.first
       end
       tracker.analytics_id.present? ? tracker : nil if tracker
     end
 
-
     def clear_cache
-      Rails.cache.delete("current_tracker")
+      TRACKING_ENGINES.each do |engine|
+        Rails.cache.delete("current_tracker/#{engine}")
+      end
     end
   end
 end

data/config/locales/en.yml

@@ -96,8 +96,10 @@ en:
         path: Path
         starts_at: Starts At
         usage_limit: Usage Limit
+        promotion_category: Promotion Category
       spree/promotion_category:
         name: Name
+        code: Code
       spree/property:
         name: Name
         presentation: Presentation
@@ -476,6 +478,8 @@ en:
         taxonomies: Taxonomies
         taxons: Taxons
         users: Users
+        return_authorizations: Return Authorizations
+        customer_returns: Customer Returns
       order:
         events:
           approve: approve
@@ -513,6 +517,7 @@ en:
     analytics_desc_list_2: Requires only a free Spree account to activate
     analytics_desc_list_3: Absolutely no code to install
     analytics_desc_list_4: It's completely free!
+    analytics_engine: Analytics Engine
     analytics_trackers: Analytics Trackers
     and: and
     approve: approve
@@ -832,8 +837,6 @@ en:
     items_to_be_reimbursed: Items to be reimbursed
     items_reimbursed: Items reimbursed
     jirafe: Jirafe
-    landing_page_rule:
-      path: Path
     last_name: Last Name
     last_name_begins_with: Last Name Begins With
     learn_more: Learn More
@@ -1030,6 +1033,7 @@ en:
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
     payment_state: Payment State
+    payment_identifier: Payment Identifier
     payment_states:
       balance_due: balance due
       checkout: checkout
@@ -1113,9 +1117,6 @@ en:
       item_total:
         description: Order total meets these criteria
         name: Item total
-      landing_page:
-        description: Customer must have visited the specified page
-        name: Landing Page
       one_use_per_user:
         description: Only One Use Per User
         name: One Use Per User
@@ -1158,7 +1159,6 @@ en:
     reference: Reference
     reference_contains: Reference Contains
     refund: Refund
-    refund_amount_must_be_greater_than_zero: Refund amount must be greater than zero
     refund_reasons: Refund Reasons
     refunded_amount: Refunded Amount
     refunds: Refunds

data/db/migrate/20170722102643_add_analytics_kind_to_spree_trackers.rb

@@ -0,0 +1,5 @@
+class AddAnalyticsKindToSpreeTrackers < ActiveRecord::Migration[5.1]
+  def change
+    add_column :spree_trackers, :kind, :integer, default: 0, null: false, index: true
+  end
+end

data/db/migrate/20170727103056_rename_tracker_kind_field.rb

@@ -0,0 +1,5 @@
+class RenameTrackerKindField < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :spree_trackers, :kind, :engine
+  end
+end

data/lib/spree/core/importer/order.rb

@@ -54,7 +54,7 @@ module Spree
             begin
               shipment = order.shipments.build
               shipment.tracking       = s[:tracking]
-              shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
+              shipment.stock_location = Spree::StockLocation.find_by(admin_name: s[:stock_location]) || Spree::StockLocation.find_by!(name: s[:stock_location])
               inventory_units = create_inventory_units_from_order_and_params(order, s[:inventory_units])
 
               inventory_units.each do |inventory_unit|
@@ -75,7 +75,7 @@ module Spree
 
               shipment.save!
 
-              shipping_method = Spree::ShippingMethod.find_by_name(s[:shipping_method]) || Spree::ShippingMethod.find_by_admin_name!(s[:shipping_method])
+              shipping_method = Spree::ShippingMethod.find_by(name: s[:shipping_method]) || Spree::ShippingMethod.find_by!(admin_name: s[:shipping_method])
               rate = shipment.shipping_rates.create!(shipping_method: shipping_method, cost: s[:cost])
 
               shipment.selected_shipping_rate_id = rate.id
@@ -187,7 +187,7 @@ module Spree
               # spree_wombat serializes payment state as status so imported orders should fall back to status field.
               payment.state = p[:state] || p[:status] || 'completed'
               payment.created_at = p[:created_at] if p[:created_at]
-              payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
+              payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
               payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
               payment.save!
             rescue Exception => e
@@ -218,7 +218,7 @@ module Spree
           begin
             sku = hash.delete(:sku)
             unless hash[:variant_id].present?
-              hash[:variant_id] = Spree::Variant.active.find_by_sku!(sku).id
+              hash[:variant_id] = Spree::Variant.active.find_by!(sku: sku).id
             end
             hash
           rescue ActiveRecord::RecordNotFound => e

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.3.0.rc2"
+    "3.3.0.rc3"
   end
 end

data/lib/spree/testing_support/factories/state_factory.rb

@@ -3,7 +3,7 @@ FactoryGirl.define do
     sequence(:name) { |n| "STATE_NAME_#{n}" }
     sequence(:abbr) { |n| "STATE_ABBR_#{n}" }
     country do |country|
-      if usa = Spree::Country.find_by_numcode(840)
+      if usa = Spree::Country.find_by(numcode: 840)
         country = usa
       else
         country.association(:country)

data/lib/spree/testing_support/factories/tracker_factory.rb

@@ -2,5 +2,6 @@ FactoryGirl.define do
   factory :tracker, class: Spree::Tracker do
     analytics_id 'A100'
     active true
+    engine :google_analytics
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc2
+  version: 3.3.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -545,7 +545,6 @@ files:
 - app/models/spree/zone_member.rb
 - app/validators/db_maximum_length_validator.rb
 - app/views/layouts/spree/base_mailer.html.erb
-- app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
 - app/views/spree/order_mailer/_adjustment.html.erb
 - app/views/spree/order_mailer/_subtotal.html.erb
 - app/views/spree/order_mailer/_total.html.erb
@@ -834,6 +833,8 @@ files:
 - db/migrate/20170331124513_add_index_to_spree_stock_items.rb
 - db/migrate/20170331124924_add_index_to_spree_stock_movement.rb
 - db/migrate/20170413211707_change_indexes_on_friendly_id_slugs.rb
+- db/migrate/20170722102643_add_analytics_kind_to_spree_trackers.rb
+- db/migrate/20170727103056_rename_tracker_kind_field.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -961,11 +962,8 @@ files:
 - lib/tasks/exchanges.rake
 - script/rails
 - spree_core.gemspec
-- vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
-- vendor/assets/stylesheets/normalize.css
-- vendor/assets/stylesheets/skeleton.css
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3-Clause

data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb

@@ -1,19 +0,0 @@
-<script type='text/template' id='customer_autocomplete_template'>
-  <div class='customer-autocomplete-item'>
-    <div class='customer-details'>
-      <h5>{{customer.email}}</h5>
-      {{#if bill_address.firstname }}
-        <strong>{{t 'bill_address' }}</strong>
-        {{bill_address.firstname}} {{bill_address.lastname}}<br>
-        {{bill_address.address1}}, {{bill_address.address2}}<br>
-        {{bill_address.city}}<br>
-        {{#if bill_address.state_id }}
-          {{bill_address.state.name}}
-        {{else}}
-          {{bill_address.state_name}}
-        {{/if}}
-        {{bill_address.country.name}}
-      {{/if}}
-    </div>
-  </div>
-</script>

data/vendor/assets/javascripts/jquery-migrate-1.0.0.js

@@ -1,498 +0,0 @@
-/*!
- * jQuery Migrate - v1.0.0 - 2013-01-14
- * https://github.com/jquery/jquery-migrate
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
- */
-(function( jQuery, window, undefined ) {
-"use strict";
-
-
-var warnedAbout = {};
-
-// List of warnings already given; public read only
-jQuery.migrateWarnings = [];
-
-// Set to true to prevent console output; migrateWarnings still maintained
-// jQuery.migrateMute = false;
-
-// Forget any warnings we've already given; public
-jQuery.migrateReset = function() {
-  warnedAbout = {};
-  jQuery.migrateWarnings.length = 0;
-};
-
-function migrateWarn( msg) {
-  if ( !warnedAbout[ msg ] ) {
-    warnedAbout[ msg ] = true;
-    jQuery.migrateWarnings.push( msg );
-    if ( window.console && console.warn && !jQuery.migrateMute ) {
-      console.warn( "JQMIGRATE: " + msg );
-    }
-  }
-}
-
-function migrateWarnProp( obj, prop, value, msg ) {
-  if ( Object.defineProperty ) {
-    // On ES5 browsers (non-oldIE), warn if the code tries to get prop;
-    // allow property to be overwritten in case some other plugin wants it
-    try {
-      Object.defineProperty( obj, prop, {
-        configurable: true,
-        enumerable: true,
-        get: function() {
-          migrateWarn( msg );
-          return value;
-        },
-        set: function( newValue ) {
-          migrateWarn( msg );
-          value = newValue;
-        }
-      });
-      return;
-    } catch( err ) {
-      // IE8 is a dope about Object.defineProperty, can't warn there
-    }
-  }
-
-  // Non-ES5 (or broken) browser; just set the property
-  jQuery._definePropertyBroken = true;
-  obj[ prop ] = value;
-}
-
-if ( document.compatMode === "BackCompat" ) {
-  // jQuery has never supported or tested Quirks Mode
-  migrateWarn( "jQuery is not compatible with Quirks Mode" );
-}
-
-
-var attrFn = {},
-  attr = jQuery.attr,
-  valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
-    function() { return null; },
-  valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
-    function() { return undefined; },
-  rnoType = /^(?:input|button)$/i,
-  rnoAttrNodeType = /^[238]$/,
-  rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-  ruseDefault = /^(?:checked|selected)$/i;
-
-// jQuery.attrFn
-migrateWarnProp( jQuery, "attrFn", attrFn, "jQuery.attrFn is deprecated" );
-
-jQuery.attr = function( elem, name, value, pass ) {
-  var lowerName = name.toLowerCase(),
-    nType = elem && elem.nodeType;
-
-  if ( pass ) {
-    migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
-    if ( elem && !rnoAttrNodeType.test( nType ) && jQuery.isFunction( jQuery.fn[ name ] ) ) {
-      return jQuery( elem )[ name ]( value );
-    }
-  }
-
-  // Warn if user tries to set `type` since it breaks on IE 6/7/8
-  if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) ) {
-    migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
-  }
-
-  // Restore boolHook for boolean property/attribute synchronization
-  if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
-    jQuery.attrHooks[ lowerName ] = {
-      get: function( elem, name ) {
-        // Align boolean attributes with corresponding properties
-        // Fall back to attribute presence where some booleans are not supported
-        var attrNode,
-          property = jQuery.prop( elem, name );
-        return property === true || typeof property !== "boolean" &&
-          ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-
-          name.toLowerCase() :
-          undefined;
-      },
-      set: function( elem, value, name ) {
-        var propName;
-        if ( value === false ) {
-          // Remove boolean attributes when set to false
-          jQuery.removeAttr( elem, name );
-        } else {
-          // value is true since we know at this point it's type boolean and not false
-          // Set boolean attributes to the same name and set the DOM property
-          propName = jQuery.propFix[ name ] || name;
-          if ( propName in elem ) {
-            // Only set the IDL specifically if it already exists on the element
-            elem[ propName ] = true;
-          }
-
-          elem.setAttribute( name, name.toLowerCase() );
-        }
-        return name;
-      }
-    };
-
-    // Warn only for attributes that can remain distinct from their properties post-1.9
-    if ( ruseDefault.test( lowerName ) ) {
-      migrateWarn( "jQuery.fn.attr(" + lowerName + ") may use property instead of attribute" );
-    }
-  }
-
-  return attr.call( jQuery, elem, name, value );
-};
-
-// attrHooks: value
-jQuery.attrHooks.value = {
-  get: function( elem, name ) {
-    var nodeName = ( elem.nodeName || "" ).toLowerCase();
-    if ( nodeName === "button" ) {
-      return valueAttrGet.apply( this, arguments );
-    }
-    if ( nodeName !== "input" && nodeName !== "option" ) {
-      migrateWarn("property-based jQuery.fn.attr('value') is deprecated");
-    }
-    return name in elem ?
-      elem.value :
-      null;
-  },
-  set: function( elem, value ) {
-    var nodeName = ( elem.nodeName || "" ).toLowerCase();
-    if ( nodeName === "button" ) {
-      return valueAttrSet.apply( this, arguments );
-    }
-    if ( nodeName !== "input" && nodeName !== "option" ) {
-      migrateWarn("property-based jQuery.fn.attr('value', val) is deprecated");
-    }
-    // Does not return so that setAttribute is also used
-    elem.value = value;
-  }
-};
-
-
-var matched, browser,
-  oldInit = jQuery.fn.init,
-  // Note this does NOT include the # XSS fix from 1.7!
-  rquickExpr = /^(?:.*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
-
-// $(html) "looks like html" rule change
-jQuery.fn.init = function( selector, context, rootjQuery ) {
-  var match;
-
-  if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
-      (match = rquickExpr.exec( selector )) && match[1] ) {
-    // This is an HTML string according to the "old" rules; is it still?
-    if ( selector.charAt( 0 ) !== "<" ) {
-      migrateWarn("$(html) HTML strings must start with '<' character");
-    }
-    // Now process using loose rules; let pre-1.8 play too
-    if ( context && context.context ) {
-      // jQuery object as context; parseHTML expects a DOM object
-      context = context.context;
-    }
-    if ( jQuery.parseHTML ) {
-      return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
-          context, rootjQuery );
-    }
-  }
-  return oldInit.apply( this, arguments );
-};
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.uaMatch = function( ua ) {
-  ua = ua.toLowerCase();
-
-  var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-    /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-    /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-    /(msie) ([\w.]+)/.exec( ua ) ||
-    ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-    [];
-
-  return {
-    browser: match[ 1 ] || "",
-    version: match[ 2 ] || "0"
-  };
-};
-
-matched = jQuery.uaMatch( navigator.userAgent );
-browser = {};
-
-if ( matched.browser ) {
-  browser[ matched.browser ] = true;
-  browser.version = matched.version;
-}
-
-// Chrome is Webkit, but Webkit is also Safari.
-if ( browser.chrome ) {
-  browser.webkit = true;
-} else if ( browser.webkit ) {
-  browser.safari = true;
-}
-
-jQuery.browser = browser;
-
-// Warn if the code tries to get jQuery.browser
-migrateWarnProp( jQuery, "browser", browser, "jQuery.browser is deprecated" );
-
-jQuery.sub = function() {
-  function jQuerySub( selector, context ) {
-    return new jQuerySub.fn.init( selector, context );
-  }
-  jQuery.extend( true, jQuerySub, this );
-  jQuerySub.superclass = this;
-  jQuerySub.fn = jQuerySub.prototype = this();
-  jQuerySub.fn.constructor = jQuerySub;
-  jQuerySub.sub = this.sub;
-  jQuerySub.fn.init = function init( selector, context ) {
-    if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-      context = jQuerySub( context );
-    }
-
-    return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-  };
-  jQuerySub.fn.init.prototype = jQuerySub.fn;
-  var rootjQuerySub = jQuerySub(document);
-  migrateWarn( "jQuery.sub() is deprecated" );
-  return jQuerySub;
-};
-
-
-var oldFnData = jQuery.fn.data;
-
-jQuery.fn.data = function( name ) {
-  var ret, evt,
-    elem = this[0];
-
-  // Handles 1.7 which has this behavior and 1.8 which doesn't
-  if ( elem && name === "events" && arguments.length === 1 ) {
-    ret = jQuery.data( elem, name );
-    evt = jQuery._data( elem, name );
-    if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
-      migrateWarn("Use of jQuery.fn.data('events') is deprecated");
-      return evt;
-    }
-  }
-  return oldFnData.apply( this, arguments );
-};
-
-
-var rscriptType = /\/(java|ecma)script/i,
-  oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
-  oldFragment = jQuery.buildFragment;
-
-jQuery.fn.andSelf = function() {
-  migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
-  return oldSelf.apply( this, arguments );
-};
-
-// Since jQuery.clean is used internally on older versions, we only shim if it's missing
-if ( !jQuery.clean ) {
-  jQuery.clean = function( elems, context, fragment, scripts ) {
-    // Set context per 1.8 logic
-    context = context || document;
-    context = !context.nodeType && context[0] || context;
-    context = context.ownerDocument || context;
-
-    migrateWarn("jQuery.clean() is deprecated");
-
-    var i, elem, handleScript, jsTags,
-      ret = [];
-
-    jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
-
-    // Complex logic lifted directly from jQuery 1.8
-    if ( fragment ) {
-      // Special handling of each script element
-      handleScript = function( elem ) {
-        // Check if we consider it executable
-        if ( !elem.type || rscriptType.test( elem.type ) ) {
-          // Detach the script and store it in the scripts array (if provided) or the fragment
-          // Return truthy to indicate that it has been handled
-          return scripts ?
-            scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
-            fragment.appendChild( elem );
-        }
-      };
-
-      for ( i = 0; (elem = ret[i]) != null; i++ ) {
-        // Check if we're done after handling an executable script
-        if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
-          // Append to fragment and handle embedded scripts
-          fragment.appendChild( elem );
-          if ( typeof elem.getElementsByTagName !== "undefined" ) {
-            // handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
-            jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
-
-            // Splice the scripts into ret after their former ancestor and advance our index beyond them
-            ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-            i += jsTags.length;
-          }
-        }
-      }
-    }
-
-    return ret;
-  };
-}
-
-jQuery.buildFragment = function( elems, context, scripts, selection ) {
-  var ret,
-    warning = "jQuery.buildFragment() is deprecated";
-
-  // Set context per 1.8 logic
-  context = context || document;
-  context = !context.nodeType && context[0] || context;
-  context = context.ownerDocument || context;
-
-  try {
-    ret = oldFragment.call( jQuery, elems, context, scripts, selection );
-
-  // jQuery < 1.8 required arrayish context; jQuery 1.9 fails on it
-  } catch( x ) {
-    ret = oldFragment.call( jQuery, elems, context.nodeType ? [ context ] : context[ 0 ], scripts, selection );
-
-    // Success from tweaking context means buildFragment was called by the user
-    migrateWarn( warning );
-  }
-
-  // jQuery < 1.9 returned an object instead of the fragment itself
-  if ( !ret.fragment ) {
-    migrateWarnProp( ret, "fragment", ret, warning );
-    migrateWarnProp( ret, "cacheable", false, warning );
-  }
-
-  return ret;
-};
-
-var eventAdd = jQuery.event.add,
-  eventRemove = jQuery.event.remove,
-  eventTrigger = jQuery.event.trigger,
-  oldToggle = jQuery.fn.toggle,
-  oldLive = jQuery.fn.live,
-  oldDie = jQuery.fn.die,
-  ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
-  rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
-  rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
-  hoverHack = function( events ) {
-    if ( typeof( events ) != "string" || jQuery.event.special.hover ) {
-      return events;
-    }
-    if ( rhoverHack.test( events ) ) {
-      migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
-    }
-    return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-  };
-
-// Event props removed in 1.9, put them back if needed; no practical way to warn them
-if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
-  jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
-}
-
-// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
-migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
-
-// Support for 'hover' pseudo-event and ajax event warnings
-jQuery.event.add = function( elem, types, handler, data, selector ){
-  if ( elem !== document && rajaxEvent.test( types ) ) {
-    migrateWarn( "AJAX events should be attached to document: " + types );
-  }
-  eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
-};
-jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
-  eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
-};
-
-jQuery.fn.error = function() {
-  var args = Array.prototype.slice.call( arguments, 0);
-  migrateWarn("jQuery.fn.error() is deprecated");
-  args.splice( 0, 0, "error" );
-  if ( arguments.length ) {
-    return this.bind.apply( this, args );
-  }
-  // error event should not bubble to window, although it does pre-1.7
-  this.triggerHandler.apply( this, args );
-  return this;
-};
-
-jQuery.fn.toggle = function( fn, fn2 ) {
-
-  // Don't mess with animation or css toggles
-  if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
-    return oldToggle.apply( this, arguments );
-  }
-  migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
-
-  // Save reference to arguments for access in closure
-  var args = arguments,
-    guid = fn.guid || jQuery.guid++,
-    i = 0,
-    toggler = function( event ) {
-      // Figure out which function to execute
-      var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-      jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-      // Make sure that clicks stop
-      event.preventDefault();
-
-      // and execute the function
-      return args[ lastToggle ].apply( this, arguments ) || false;
-    };
-
-  // link all the functions, so any of them can unbind this click handler
-  toggler.guid = guid;
-  while ( i < args.length ) {
-    args[ i++ ].guid = guid;
-  }
-
-  return this.click( toggler );
-};
-
-jQuery.fn.live = function( types, data, fn ) {
-  migrateWarn("jQuery.fn.live() is deprecated");
-  if ( oldLive ) {
-    return oldLive.apply( this, arguments );
-  }
-  jQuery( this.context ).on( types, this.selector, data, fn );
-  return this;
-};
-
-jQuery.fn.die = function( types, fn ) {
-  migrateWarn("jQuery.fn.die() is deprecated");
-  if ( oldDie ) {
-    return oldDie.apply( this, arguments );
-  }
-  jQuery( this.context ).off( types, this.selector || "**", fn );
-  return this;
-};
-
-// Turn global events into document-triggered events
-jQuery.event.trigger = function( event, data, elem, onlyHandlers  ){
-  if ( !elem & !rajaxEvent.test( event ) ) {
-    migrateWarn( "Global events are undocumented and deprecated" );
-  }
-  return eventTrigger.call( this,  event, data, elem || document, onlyHandlers  );
-};
-jQuery.each( ajaxEvents.split("|"),
-  function( _, name ) {
-    jQuery.event.special[ name ] = {
-      setup: function() {
-        var elem = this;
-
-        // The document needs no shimming; must be !== for oldIE
-        if ( elem !== document ) {
-          jQuery.event.add( document, name + "." + jQuery.guid, function() {
-            jQuery.event.trigger( name, null, elem, true );
-          });
-          jQuery._data( this, name, jQuery.guid++ );
-        }
-        return false;
-      },
-      teardown: function() {
-        if ( this !== document ) {
-          jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
-        }
-        return false;
-      }
-    };
-  }
-);
-
-
-})( jQuery, window );