From c79a917bbe268ce44b78bff349452ef6a8baf7db Mon Sep 17 00:00:00 2001 From: lilia Date: Fri, 23 Oct 2015 16:34:54 -0700 Subject: [PATCH] Remove unused localStorage adapter And remove various stray references to localStorage // FREEBIE --- CONTRIBUTING.md | 5 +- bower.json | 4 - .../backbone.localStorage.js | 262 ------------------ js/options.js | 1 - 4 files changed, 1 insertion(+), 271 deletions(-) delete mode 100644 components/backbone.localstorage/backbone.localStorage.js diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f826cf339..3a1539dd9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -54,10 +54,7 @@ Currently only the Android client supports multi-device pairing. * Enter the verification code you received by SMS. * Wait for key generation to complete. -You should now be able to use the extension. If you need to re-register, open a -browser console within the extension options page (or inspect -`background.html`) and execute `localStorage.clear()` to delete your account -information. +You should now be able to use the extension. ## Chrome profiles diff --git a/bower.json b/bower.json index 8ac6fdfac..9506a7012 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,6 @@ "qrcode": "git://github.com/davidshimjs/qrcodejs.git#1c78ccd71", "cryptojs": "svn+http://crypto-js.googlecode.com/svn/#~3.1.2", "libphonenumber-api": "git://github.com/codedust/libphonenumber-api", - "backbone.localstorage": "liliakai/Backbone.localStorage#master", "momentjs": "~2.8.3", "indexeddb-backbonejs-adapter": "*", "intl-tel-input": "~4.0.1", @@ -78,9 +77,6 @@ "libphonenumber-api": [ "libphonenumber_api-compiled.js" ], - "backbone.localstorage": [ - "backbone.localStorage.js" - ], "momentjs": [ "moment.js" ], diff --git a/components/backbone.localstorage/backbone.localStorage.js b/components/backbone.localstorage/backbone.localStorage.js deleted file mode 100644 index e83b496e9..000000000 --- a/components/backbone.localstorage/backbone.localStorage.js +++ /dev/null @@ -1,262 +0,0 @@ -/** - * Backbone localStorage Adapter - * Version 1.1.14 - * - * https://github.com/jeromegn/Backbone.localStorage - */ -(function (root, factory) { - if (typeof exports === 'object' && typeof require === 'function') { - module.exports = factory(require("backbone")); - } else if (typeof define === "function" && define.amd) { - // AMD. Register as an anonymous module. - define(["backbone"], function(Backbone) { - // Use global variables if the locals are undefined. - return factory(Backbone || root.Backbone); - }); - } else { - factory(Backbone); - } -}(this, function(Backbone) { -// A simple module to replace `Backbone.sync` with *localStorage*-based -// persistence. Models are given GUIDS, and saved into a JSON object. Simple -// as that. - -// Generate four random hex digits. -function S4() { - return (((1+Math.random())*0x10000)|0).toString(16).substring(1); -}; - -// Generate a pseudo-GUID by concatenating random hexadecimal. -function guid() { - return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4()); -}; - -function isObject(item) { - return item === Object(item); -} - -function contains(array, item) { - var i = array.length; - while (i--) if (array[i] === item) return true; - return false; -} - -function extend(obj, props) { - for (var key in props) obj[key] = props[key] - return obj; -} - -function result(object, property) { - if (object == null) return void 0; - var value = object[property]; - return (typeof value === 'function') ? object[property]() : value; -} - -// Our Store is represented by a single JS object in *localStorage*. Create it -// with a meaningful name, like the name you'd give a table. -// window.Store is deprectated, use Backbone.LocalStorage instead -Backbone.LocalStorage = window.Store = function(name, serializer) { - if( !this.localStorage ) { - throw "Backbone.localStorage: Environment does not support localStorage." - } - this.name = name; - this.serializer = serializer || { - serialize: function(item) { - return isObject(item) ? JSON.stringify(item) : item; - }, - // fix for "illegal access" error on Android when JSON.parse is passed null - deserialize: function (data) { - return data && JSON.parse(data); - } - }; - var store = this.localStorage().getItem(this.name); - this.records = (store && store.split(",")) || []; -}; - -extend(Backbone.LocalStorage.prototype, { - - // Save the current state of the **Store** to *localStorage*. - save: function() { - var store = this.localStorage().getItem(this.name); - this.records = _.union(this.records, store && store.split(",")); - this.localStorage().setItem(this.name, this.records.join(",")); - }, - - // Add a model, giving it a (hopefully)-unique GUID, if it doesn't already - // have an id of it's own. - create: function(model) { - if (!model.id && model.id !== 0) { - model.id = guid(); - model.set(model.idAttribute, model.id); - } - this.localStorage().setItem(this._itemName(model.id), this.serializer.serialize(model)); - this.records.push(model.id.toString()); - this.save(); - return this.find(model); - }, - - // Update a model by replacing its copy in `this.data`. - update: function(model) { - this.localStorage().setItem(this._itemName(model.id), this.serializer.serialize(model)); - var modelId = model.id.toString(); - if (!contains(this.records, modelId)) { - this.records.push(modelId); - this.save(); - } - return this.find(model); - }, - - // Retrieve a model from `this.data` by id. - find: function(model) { - var store = this.localStorage().getItem(this.name); - this.records = (store && store.split(",")) || []; - return this.serializer.deserialize(this.localStorage().getItem(this._itemName(model.id))); - }, - - // Return the array of all models currently in storage. - findAll: function() { - var store = this.localStorage().getItem(this.name); - this.records = (store && store.split(",")) || []; - var result = []; - for (var i = 0, id, data; i < this.records.length; i++) { - id = this.records[i]; - data = this.serializer.deserialize(this.localStorage().getItem(this._itemName(id))); - if (data != null) result.push(data); - } - return result; - }, - - // Delete a model from `this.data`, returning it. - destroy: function(model) { - this.localStorage().removeItem(this._itemName(model.id)); - var modelId = model.id.toString(); - for (var i = 0, id; i < this.records.length; i++) { - if (this.records[i] === modelId) { - this.records.splice(i, 1); - } - } - this.save(); - return model; - }, - - localStorage: function() { - return localStorage; - }, - - // Clear localStorage for specific collection. - _clear: function() { - var local = this.localStorage(), - itemRe = new RegExp("^" + this.name + "-"); - - // Remove id-tracking item (e.g., "foo"). - local.removeItem(this.name); - - // Match all data items (e.g., "foo-ID") and remove. - for (var k in local) { - if (itemRe.test(k)) { - local.removeItem(k); - } - } - - this.records.length = 0; - }, - - // Size of localStorage. - _storageSize: function() { - return this.localStorage().length; - }, - - _itemName: function(id) { - return this.name+"-"+id; - } - -}); - -// localSync delegate to the model or collection's -// *localStorage* property, which should be an instance of `Store`. -// window.Store.sync and Backbone.localSync is deprecated, use Backbone.LocalStorage.sync instead -Backbone.LocalStorage.sync = window.Store.sync = Backbone.localSync = function(method, model, options) { - var store = result(model, 'localStorage') || result(model.collection, 'localStorage'); - - var resp, errorMessage; - //If $ is having Deferred - use it. - var syncDfd = Backbone.$ ? - (Backbone.$.Deferred && Backbone.$.Deferred()) : - (Backbone.Deferred && Backbone.Deferred()); - - try { - - switch (method) { - case "read": - resp = model.id != undefined ? store.find(model) : store.findAll(); - break; - case "create": - resp = store.create(model); - break; - case "update": - resp = store.update(model); - break; - case "delete": - resp = store.destroy(model); - break; - } - - } catch(error) { - if (error.code === 22 && store._storageSize() === 0) - errorMessage = "Private browsing is unsupported"; - else - errorMessage = error.message; - } - - if (resp) { - if (options && options.success) { - if (Backbone.VERSION === "0.9.10") { - options.success(model, resp, options); - } else { - options.success(resp); - } - } - if (syncDfd) { - syncDfd.resolve(resp); - } - - } else { - errorMessage = errorMessage ? errorMessage - : "Record Not Found"; - - if (options && options.error) - if (Backbone.VERSION === "0.9.10") { - options.error(model, errorMessage, options); - } else { - options.error(errorMessage); - } - - if (syncDfd) - syncDfd.reject(errorMessage); - } - - // add compatibility with $.ajax - // always execute callback for success and error - if (options && options.complete) options.complete(resp); - - return syncDfd && syncDfd.promise(); -}; - -Backbone.ajaxSync = Backbone.sync; - -Backbone.getSyncMethod = function(model) { - if(model.localStorage || (model.collection && model.collection.localStorage)) { - return Backbone.localSync; - } - - return Backbone.ajaxSync; -}; - -// Override 'Backbone.sync' to default to localSync, -// the original 'Backbone.sync' is still available in 'Backbone.ajaxSync' -Backbone.sync = function(method, model, options) { - return Backbone.getSyncMethod(model).apply(this, [method, model, options]); -}; - -return Backbone.LocalStorage; -})); diff --git a/js/options.js b/js/options.js index 2ebf569ca..ab74e8645 100644 --- a/js/options.js +++ b/js/options.js @@ -34,7 +34,6 @@ $('#qr').hide(); $('.confirmation-dialog .number').text(number); $('.confirmation-dialog .cancel').click(function(e) { - localStorage.clear(); reject(); }); $('.confirmation-dialog .ok').click(function(e) {