mirror of
https://github.com/gorhill/uMatrix.git
synced 2024-06-02 18:34:52 +12:00
remove XAL abstraction
This commit is contained in:
parent
86019cd064
commit
d691e6e585
|
@ -17,7 +17,6 @@
|
||||||
<script src="js/vapi-cachestorage.js"></script>
|
<script src="js/vapi-cachestorage.js"></script>
|
||||||
|
|
||||||
<script src="js/background.js"></script>
|
<script src="js/background.js"></script>
|
||||||
<script src="js/xal.js"></script>
|
|
||||||
<script src="js/usersettings.js"></script>
|
<script src="js/usersettings.js"></script>
|
||||||
<script src="js/liquid-dict.js"></script>
|
<script src="js/liquid-dict.js"></script>
|
||||||
<script src="js/matrix.js"></script>
|
<script src="js/matrix.js"></script>
|
||||||
|
|
|
@ -883,7 +883,7 @@ var restoreUserData = function(userData) {
|
||||||
|
|
||||||
// If we are going to restore all, might as well wipe out clean local
|
// If we are going to restore all, might as well wipe out clean local
|
||||||
// storage
|
// storage
|
||||||
µm.XAL.keyvalRemoveAll(onAllRemoved);
|
vAPI.storage.clear(onAllRemoved);
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
@ -892,7 +892,7 @@ var resetUserData = function() {
|
||||||
var onAllRemoved = function() {
|
var onAllRemoved = function() {
|
||||||
vAPI.app.restart();
|
vAPI.app.restart();
|
||||||
};
|
};
|
||||||
µm.XAL.keyvalRemoveAll(onAllRemoved);
|
vAPI.storage.clear(onAllRemoved);
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
µMatrix.saveUserSettings = function() {
|
µMatrix.saveUserSettings = function() {
|
||||||
this.XAL.keyvalSetMany(
|
vAPI.storage.set(
|
||||||
this.userSettings,
|
this.userSettings,
|
||||||
this.getBytesInUse.bind(this)
|
this.getBytesInUse.bind(this)
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,71 +0,0 @@
|
||||||
/*******************************************************************************
|
|
||||||
|
|
||||||
µMatrix - a Chromium browser extension to black/white list requests.
|
|
||||||
Copyright (C) 2014 Raymond Hill
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
|
|
||||||
Home: https://github.com/gorhill/uMatrix
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* global chrome, µMatrix */
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
µMatrix.XAL = (function(){
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
var exports = {};
|
|
||||||
var noopFunc = function(){};
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
exports.keyvalSetOne = function(key, val, callback) {
|
|
||||||
var bin = {};
|
|
||||||
bin[key] = val;
|
|
||||||
vAPI.storage.set(bin, callback || noopFunc);
|
|
||||||
};
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
exports.keyvalGetOne = function(key, callback) {
|
|
||||||
vAPI.storage.get(key, callback);
|
|
||||||
};
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
exports.keyvalSetMany = function(dict, callback) {
|
|
||||||
vAPI.storage.set(dict, callback || noopFunc);
|
|
||||||
};
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
exports.keyvalRemoveOne = function(key, callback) {
|
|
||||||
vAPI.storage.remove(key, callback || noopFunc);
|
|
||||||
};
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
exports.keyvalRemoveAll = function(callback) {
|
|
||||||
vAPI.storage.clear(callback || noopFunc);
|
|
||||||
};
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
return exports;
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
})();
|
|
Loading…
Reference in a new issue