remove Cookies class from global space
This commit is contained in:
parent
77eda52870
commit
5f7c0bd7b7
19 changed files with 36 additions and 185 deletions
|
@ -1,6 +1,7 @@
|
|||
/* eslint-disable no-param-reassign, class-methods-use-this */
|
||||
/* global Pager */
|
||||
/* global Cookies */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
class Activities {
|
||||
constructor() {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* global Cookies */
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
import emojiMap from 'emojis/digests.json';
|
||||
import emojiAliases from 'emojis/aliases.json';
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
/* global ListLabel */
|
||||
/* global Cookies */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
const Store = gl.issueBoards.BoardsStore;
|
||||
|
||||
export default {
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
/* eslint-disable comma-dangle, space-before-function-paren, one-var, no-shadow, dot-notation, max-len */
|
||||
/* global Cookies */
|
||||
/* global List */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
(() => {
|
||||
window.gl = window.gl || {};
|
||||
window.gl.issueBoards = window.gl.issueBoards || {};
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
/* global Cookies */
|
||||
/* global Flash */
|
||||
|
||||
import Vue from 'vue';
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
window.Cookies = require('js-cookie');
|
||||
require('./components/stage_code_component');
|
||||
require('./components/stage_issue_component');
|
||||
require('./components/stage_plan_component');
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
/* global CommentsStore Cookies notes */
|
||||
/* global CommentsStore */
|
||||
/* global notes */
|
||||
|
||||
import Vue from 'vue';
|
||||
import collapseIcon from '../icons/collapse_icon.svg';
|
||||
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-new, comma-dangle, quotes, prefer-arrow-callback, consistent-return, one-var, no-var, one-var-declaration-per-line, no-underscore-dangle, max-len */
|
||||
/* global UsersSelect */
|
||||
/* global Cookies */
|
||||
/* global bp */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
(function() {
|
||||
this.IssuableContext = (function() {
|
||||
function IssuableContext(currentUser) {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, no-var, quotes, consistent-return, prefer-arrow-callback, comma-dangle, object-shorthand, no-new, max-len, no-multi-spaces, import/newline-after-import, import/first */
|
||||
/* global bp */
|
||||
/* global Cookies */
|
||||
/* global Flash */
|
||||
/* global ConfirmDangerModal */
|
||||
/* global Aside */
|
||||
|
@ -24,7 +23,6 @@ import './extensions/array';
|
|||
window.jQuery = jQuery;
|
||||
window.$ = jQuery;
|
||||
window._ = _;
|
||||
window.Cookies = Cookies;
|
||||
window.Pikaday = Pikaday;
|
||||
window.Dropzone = Dropzone;
|
||||
window.Sortable = Sortable;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* eslint-disable comma-dangle, object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue, max-len */
|
||||
/* global Cookies */
|
||||
|
||||
import Vue from 'vue';
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
((global) => {
|
||||
global.mergeConflicts = global.mergeConflicts || {};
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
/* eslint-disable no-new, class-methods-use-this */
|
||||
/* global Breakpoints */
|
||||
/* global Cookies */
|
||||
/* global Flash */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
require('./breakpoints');
|
||||
window.Cookies = require('js-cookie');
|
||||
require('./flash');
|
||||
|
||||
/* eslint-disable max-len */
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
/* eslint-disable no-restricted-properties, func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-use-before-define, camelcase, no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line, default-case, prefer-template, consistent-return, no-alert, no-return-assign, no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new, brace-style, no-lonely-if, vars-on-top, no-unused-vars, no-sequences, no-shadow, newline-per-chained-call, no-useless-escape */
|
||||
/* global Flash */
|
||||
/* global Autosave */
|
||||
/* global Cookies */
|
||||
/* global ResolveService */
|
||||
/* global mrRefreshWidgetUrl */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
require('./autosave');
|
||||
window.autosize = require('vendor/autosize');
|
||||
window.Dropzone = require('dropzone');
|
||||
window.Cookies = require('js-cookie');
|
||||
require('./dropzone_input');
|
||||
require('./gfm_auto_complete');
|
||||
require('vendor/jquery.caret'); // required by jquery.atwho
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */
|
||||
/* global Cookies */
|
||||
/* global ProjectSelect */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
(function() {
|
||||
this.Project = (function() {
|
||||
function Project() {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-unused-vars, consistent-return, one-var, one-var-declaration-per-line, quotes, prefer-template, object-shorthand, comma-dangle, no-else-return, no-param-reassign, max-len */
|
||||
/* global Cookies */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
(function() {
|
||||
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/* eslint-disable class-methods-use-this, comma-dangle, arrow-parens, no-param-reassign */
|
||||
/* global Cookies */
|
||||
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
((global) => {
|
||||
global.User = class {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* global Cookies */
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
const userCalloutElementName = '.user-callout';
|
||||
const closeButton = '.close-user-callout';
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
/* eslint-disable comma-dangle, one-var, no-unused-vars */
|
||||
/* global BoardService */
|
||||
/* global boardsMockInterceptor */
|
||||
/* global Cookies */
|
||||
/* global listObj */
|
||||
/* global listObjDuplicate */
|
||||
/* global ListIssue */
|
||||
|
||||
import Vue from 'vue';
|
||||
import Cookies from 'js-cookie';
|
||||
|
||||
require('~/lib/utils/url_utility');
|
||||
require('~/boards/models/issue');
|
||||
|
|
|
@ -8,7 +8,6 @@ jasmine.getJSONFixtures().fixturesPath = 'base/spec/javascripts/fixtures';
|
|||
require('~/commons/index.js');
|
||||
window.$ = window.jQuery = require('jquery');
|
||||
window._ = require('underscore');
|
||||
window.Cookies = require('js-cookie');
|
||||
|
||||
// stub expected globals
|
||||
window.gl = window.gl || {};
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
import Cookies from 'js-cookie';
|
||||
|
||||
const UserCallout = require('~/user_callout');
|
||||
|
||||
const USER_CALLOUT_COOKIE = 'user_callout_dismissed';
|
||||
const Cookie = window.Cookies;
|
||||
|
||||
describe('UserCallout', function () {
|
||||
const fixtureName = 'static/user_callout.html.raw';
|
||||
|
@ -9,7 +10,7 @@ describe('UserCallout', function () {
|
|||
|
||||
beforeEach(() => {
|
||||
loadFixtures(fixtureName);
|
||||
Cookie.remove(USER_CALLOUT_COOKIE);
|
||||
Cookies.remove(USER_CALLOUT_COOKIE);
|
||||
|
||||
this.userCallout = new UserCallout();
|
||||
this.closeButton = $('.close-user-callout');
|
||||
|
@ -18,25 +19,25 @@ describe('UserCallout', function () {
|
|||
});
|
||||
|
||||
it('does not show when cookie is set not defined', () => {
|
||||
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBeUndefined();
|
||||
expect(Cookies.get(USER_CALLOUT_COOKIE)).toBeUndefined();
|
||||
expect(this.userCalloutContainer.is(':visible')).toBe(true);
|
||||
});
|
||||
|
||||
it('shows when cookie is set to false', () => {
|
||||
Cookie.set(USER_CALLOUT_COOKIE, 'false');
|
||||
Cookies.set(USER_CALLOUT_COOKIE, 'false');
|
||||
|
||||
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBeDefined();
|
||||
expect(Cookies.get(USER_CALLOUT_COOKIE)).toBeDefined();
|
||||
expect(this.userCalloutContainer.is(':visible')).toBe(true);
|
||||
});
|
||||
|
||||
it('hides when user clicks on the dismiss-icon', () => {
|
||||
this.closeButton.click();
|
||||
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBe('true');
|
||||
expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
|
||||
});
|
||||
|
||||
it('hides when user clicks on the "check it out" button', () => {
|
||||
this.userCalloutBtn.click();
|
||||
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBe('true');
|
||||
expect(Cookies.get(USER_CALLOUT_COOKIE)).toBe('true');
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -46,7 +47,7 @@ describe('UserCallout when cookie is present', function () {
|
|||
|
||||
beforeEach(() => {
|
||||
loadFixtures(fixtureName);
|
||||
Cookie.set(USER_CALLOUT_COOKIE, 'true');
|
||||
Cookies.set(USER_CALLOUT_COOKIE, 'true');
|
||||
this.userCallout = new UserCallout();
|
||||
this.userCalloutContainer = $('.user-callout');
|
||||
});
|
||||
|
|
156
vendor/assets/javascripts/js.cookie.js
vendored
156
vendor/assets/javascripts/js.cookie.js
vendored
|
@ -1,156 +0,0 @@
|
|||
/*!
|
||||
* JavaScript Cookie v2.1.3
|
||||
* https://github.com/js-cookie/js-cookie
|
||||
*
|
||||
* Copyright 2006, 2015 Klaus Hartl & Fagner Brack
|
||||
* Released under the MIT license
|
||||
*/
|
||||
;(function (factory) {
|
||||
var registeredInModuleLoader = false;
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
define(factory);
|
||||
registeredInModuleLoader = true;
|
||||
}
|
||||
if (typeof exports === 'object') {
|
||||
module.exports = factory();
|
||||
registeredInModuleLoader = true;
|
||||
}
|
||||
if (!registeredInModuleLoader) {
|
||||
var OldCookies = window.Cookies;
|
||||
var api = window.Cookies = factory();
|
||||
api.noConflict = function () {
|
||||
window.Cookies = OldCookies;
|
||||
return api;
|
||||
};
|
||||
}
|
||||
}(function () {
|
||||
function extend () {
|
||||
var i = 0;
|
||||
var result = {};
|
||||
for (; i < arguments.length; i++) {
|
||||
var attributes = arguments[ i ];
|
||||
for (var key in attributes) {
|
||||
result[key] = attributes[key];
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function init (converter) {
|
||||
function api (key, value, attributes) {
|
||||
var result;
|
||||
if (typeof document === 'undefined') {
|
||||
return;
|
||||
}
|
||||
|
||||
// Write
|
||||
|
||||
if (arguments.length > 1) {
|
||||
attributes = extend({
|
||||
path: '/'
|
||||
}, api.defaults, attributes);
|
||||
|
||||
if (typeof attributes.expires === 'number') {
|
||||
var expires = new Date();
|
||||
expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
|
||||
attributes.expires = expires;
|
||||
}
|
||||
|
||||
try {
|
||||
result = JSON.stringify(value);
|
||||
if (/^[\{\[]/.test(result)) {
|
||||
value = result;
|
||||
}
|
||||
} catch (e) {}
|
||||
|
||||
if (!converter.write) {
|
||||
value = encodeURIComponent(String(value))
|
||||
.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
|
||||
} else {
|
||||
value = converter.write(value, key);
|
||||
}
|
||||
|
||||
key = encodeURIComponent(String(key));
|
||||
key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
|
||||
key = key.replace(/[\(\)]/g, escape);
|
||||
|
||||
return (document.cookie = [
|
||||
key, '=', value,
|
||||
attributes.expires ? '; expires=' + attributes.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
|
||||
attributes.path ? '; path=' + attributes.path : '',
|
||||
attributes.domain ? '; domain=' + attributes.domain : '',
|
||||
attributes.secure ? '; secure' : ''
|
||||
].join(''));
|
||||
}
|
||||
|
||||
// Read
|
||||
|
||||
if (!key) {
|
||||
result = {};
|
||||
}
|
||||
|
||||
// To prevent the for loop in the first place assign an empty array
|
||||
// in case there are no cookies at all. Also prevents odd result when
|
||||
// calling "get()"
|
||||
var cookies = document.cookie ? document.cookie.split('; ') : [];
|
||||
var rdecode = /(%[0-9A-Z]{2})+/g;
|
||||
var i = 0;
|
||||
|
||||
for (; i < cookies.length; i++) {
|
||||
var parts = cookies[i].split('=');
|
||||
var cookie = parts.slice(1).join('=');
|
||||
|
||||
if (cookie.charAt(0) === '"') {
|
||||
cookie = cookie.slice(1, -1);
|
||||
}
|
||||
|
||||
try {
|
||||
var name = parts[0].replace(rdecode, decodeURIComponent);
|
||||
cookie = converter.read ?
|
||||
converter.read(cookie, name) : converter(cookie, name) ||
|
||||
cookie.replace(rdecode, decodeURIComponent);
|
||||
|
||||
if (this.json) {
|
||||
try {
|
||||
cookie = JSON.parse(cookie);
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
if (key === name) {
|
||||
result = cookie;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!key) {
|
||||
result[name] = cookie;
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
api.set = api;
|
||||
api.get = function (key) {
|
||||
return api.call(api, key);
|
||||
};
|
||||
api.getJSON = function () {
|
||||
return api.apply({
|
||||
json: true
|
||||
}, [].slice.call(arguments));
|
||||
};
|
||||
api.defaults = {};
|
||||
|
||||
api.remove = function (key, attributes) {
|
||||
api(key, '', extend(attributes, {
|
||||
expires: -1
|
||||
}));
|
||||
};
|
||||
|
||||
api.withConverter = init;
|
||||
|
||||
return api;
|
||||
}
|
||||
|
||||
return init(function () {});
|
||||
}));
|
Loading…
Reference in a new issue