Commit b767891e by Ahsan Ulhaq

Replace jquery-cookie with js-cookie

ECOM-2347
parent 357ff3d4
......@@ -13,7 +13,7 @@
"backbone": "~1.2.1",
"bootstrap-sass": "~3.3.4",
"jquery": "~1.11.3",
"jquery-cookie": "~1.4.1",
"js-cookie": "~2.1.2",
"requirejs": "~2.1.15",
"underscore": "~1.8.2",
"bootstrapaccessibilityplugin": "~1.0.4",
......
......@@ -14,7 +14,7 @@ require.config({
'dataTablesBootstrap': 'bower_components/datatables/media/js/dataTables.bootstrap',
'ecommerce': 'js/shims/ecommerce',
'jquery': 'bower_components/jquery/dist/jquery',
'jquery-cookie': 'bower_components/jquery-cookie/jquery.cookie',
'js-cookie': 'bower_components/js-cookie/src/js.cookie',
'models': 'js/models',
'moment': 'bower_components/moment/moment',
'pages': 'js/pages',
......@@ -42,9 +42,6 @@ require.config({
dataTablesBootstrap: {
deps: ['jquery', 'datatables.net']
},
'jquery-cookie': {
deps: ['jquery']
},
'pikaday': {
deps: ['moment']
}
......
......@@ -3,7 +3,7 @@ define([
'backbone.super',
'backbone.validation',
'jquery',
'jquery-cookie',
'js-cookie',
'underscore',
'moment',
'collections/category_collection',
......@@ -14,7 +14,7 @@ define([
BackboneSuper,
BackboneValidation,
$,
$cookie,
Cookies,
_,
moment
) {
......@@ -192,7 +192,7 @@ define([
_.defaults(options || (options = {}), {
// The API requires a CSRF token for all POST requests using session authentication.
headers: {'X-CSRFToken': $.cookie('ecommerce_csrftoken')},
headers: {'X-CSRFToken': Cookies.get('ecommerce_csrftoken')},
contentType: 'application/json'
});
......
......@@ -6,7 +6,7 @@ define([
'backbone.super',
'backbone.validation',
'jquery',
'jquery-cookie',
'js-cookie',
'moment',
'underscore',
'collections/product_collection',
......@@ -20,7 +20,7 @@ define([
BackboneSuper,
BackboneValidation,
$,
$cookie,
Cookies,
moment,
_,
ProductCollection,
......@@ -346,7 +346,7 @@ define([
url: '/api/v2/publication/',
// The API requires a CSRF token for all POST requests using session authentication.
headers: {'X-CSRFToken': $.cookie('ecommerce_csrftoken')},
headers: {'X-CSRFToken': Cookies.get('ecommerce_csrftoken')},
// JSON or bust!
contentType: 'application/json'
......
......@@ -8,12 +8,15 @@ define([
'underscore.string',
'utils/utils',
'utils/analytics_utils',
'js-cookie'
],
function ($,
_,
_s,
Utils,
AnalyticsUtils) {
AnalyticsUtils,
Cookies
) {
'use strict';
var appendToForm = function (value, key, form) {
......@@ -30,12 +33,13 @@ define([
contentType: 'application/json; charset=utf-8',
dataType: 'json',
headers: {
'X-CSRFToken': $.cookie('ecommerce_csrftoken')
'X-CSRFToken': Cookies.get('ecommerce_csrftoken')
},
data: JSON.stringify(data),
success: onSuccess,
error: onFail
});
},
hideVoucherForm = function() {
$('#voucher_form_container').hide();
......
......@@ -7,7 +7,7 @@ define([
'models/course_seats/professional_seat',
'models/course_seats/audit_seat',
'models/course_seats/honor_seat',
'jquery-cookie'
'js-cookie'
],
function ($,
moment,
......@@ -16,7 +16,9 @@ define([
Course,
ProfessionalSeat,
AuditSeat,
HonorSeat) {
HonorSeat,
Cookies
) {
'use strict';
var model,
......@@ -264,7 +266,7 @@ define([
cookie = 'save-test';
spyOn($, 'ajax');
$.cookie('ecommerce_csrftoken', cookie);
Cookies.set('ecommerce_csrftoken', cookie);
expect(model.validate()).toBeFalsy();
model.save();
......
......@@ -7,6 +7,7 @@ define([
'models/tracking_model',
'models/user_model',
'views/analytics_view',
'js-cookie'
],
function ($,
_,
......@@ -15,7 +16,8 @@ define([
AnalyticsUtils,
TrackingModel,
UserModel,
AnalyticsView
AnalyticsView,
Cookies
) {
'use strict';
......@@ -174,7 +176,7 @@ define([
cookie = 'checkout-payment-test';
spyOn($, 'ajax');
$.cookie('ecommerce_csrftoken', cookie);
Cookies.set('ecommerce_csrftoken', cookie);
BasketPage.checkoutPayment(data);
......
......@@ -2,11 +2,13 @@ define([
'jquery',
'underscore',
'backbone',
'jquery-cookie'
'js-cookie'
],
function ($,
_,
Backbone) {
Backbone,
Cookies
) {
'use strict';
return Backbone.View.extend({
......@@ -36,7 +38,7 @@ define([
method: 'post',
contentType: 'application/json',
data: postData,
headers: {'X-CSRFToken': $.cookie('ecommerce_csrftoken')},
headers: {'X-CSRFToken': Cookies.get('ecommerce_csrftoken')},
context: this,
success: this.handleCreateOrderResponse,
error: this.handleCreateOrderError
......
......@@ -13,7 +13,7 @@ $(document).ready(function () {
$.ajax({
url: '/api/v2/orders/' + order_number + '/fulfill/',
method: 'PUT',
headers: {'X-CSRFToken': $.cookie('ecommerce_csrftoken')}
headers: {'X-CSRFToken': Cookies.get('ecommerce_csrftoken')}
}).success(function (data) {
$('tr[data-order-number=' + order_number + '] .order-status').text(data.status);
......
......@@ -16,7 +16,7 @@ $(document).ready(function () {
url: '/api/v2/refunds/' + refund_id + '/process/',
data: { action: decision },
method: 'PUT',
headers: {'X-CSRFToken': $.cookie('ecommerce_csrftoken')}
headers: {'X-CSRFToken': Cookies.get('ecommerce_csrftoken')}
}).success(function (data) {
$('tr[data-refund-id=' + refund_id + '] .refund-status').text(data.status);
......
......@@ -18,9 +18,9 @@
<script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
{% compress js %}
<script src="{% static "bower_components/jquery-cookie/jquery.cookie.js" %}" type="text/javascript"></script>
<script src="{% static "vendor-extensions/oscar/js/add_message.js" %}" type="text/javascript"></script>
<script src="{% static "vendor-extensions/oscar/js/order_list.js" %}" type="text/javascript"></script>
<script src="{% static 'bower_components/js-cookie/src/js.cookie.js' %}" type="text/javascript"></script>
<script src="{% static 'vendor-extensions/oscar/js/add_message.js' %}" type="text/javascript"></script>
<script src="{% static 'vendor-extensions/oscar/js/order_list.js' %}" type="text/javascript"></script>
{% endcompress %}
{% endblock %}
......
......@@ -17,7 +17,7 @@
<script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
{% compress js %}
<script src="{% static "bower_components/jquery-cookie/jquery.cookie.js" %}" type="text/javascript"></script>
<script src="{% static 'bower_components/js-cookie/src/js.cookie.js' %}" type="text/javascript"></script>
<script src="{% static 'vendor-extensions/oscar/js/add_message.js' %}" type="text/javascript"></script>
<script src="{% static 'vendor-extensions/oscar/js/refund_list.js' %}" type="text/javascript"></script>
{% endcompress %}
......
......@@ -18,7 +18,7 @@
<script type="text/javascript" src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
{% compress js %}
<script src="{% static "bower_components/jquery-cookie/jquery.cookie.js" %}" type="text/javascript"></script>
<script src="{% static 'bower_components/js-cookie/src/js.cookie.js' %}" type="text/javascript"></script>
<script src="{% static 'vendor-extensions/oscar/js/add_message.js' %}" type="text/javascript"></script>
<script src="{% static 'vendor-extensions/oscar/js/refund_list.js' %}" type="text/javascript"></script>
{% endcompress %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment