skobkin/chrome_point_plus
1
0
Fork 0
mirror of https://bitbucket.org/skobkin/chrome_point_plus.git synced 2024-11-23 10:46:02 +00:00
Code Issues Projects Releases Wiki Activity

Merged in isqua/chrome_point_plus/options_fix (pull request #21) Fix first installation error

Browse source
This commit is contained in:
Alexey Skobkin 2015-01-06 00:32:33 +03:00
parent 21eb253031 1057506f05
commit 3a059fe899
2 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
chrome_point_plus/js/options.js
View file

@ -39,6 +39,10 @@ Options.prototype.init = function() {
if (data.options_version !== this.version) {
console.log('Initializing options...');
$('#tabs-content input').each(function(index, input) {
this.updateOptionFromInput($(input));
}.bind(this));
chrome.storage.sync.set({
options: this.getValues(),
options_version: this.version
@ -73,30 +77,26 @@ Options.prototype.restore = function() {
this.checkOldStyle();
chrome.storage.sync.get('options', function(data) {
this._options = data.options;
this._options = data.options || {};
try {
// Setting options in DOM
$.each(data.options, function(key, data) {
switch (data.type) {
case 'boolean':
if (data.value) {
$('#' + this.getOptionName(key)).prop('checked', true);
}
break;
// Setting options in DOM
$.each(this._options, function(key, data) {
switch (data.type) {
case 'boolean':
if (data.value) {
$('#' + this.getOptionName(key)).prop('checked', true);
}
break;
case 'enum':
$('.option-node .option-enum[name="' + this.getOptionName(key) + '"][value="' + data.value + '"]').prop('checked', true);
break;
case 'enum':
$('.option-node .option-enum[name="' + this.getOptionName(key) + '"][value="' + data.value + '"]').prop('checked', true);
break;
default:
console.warn('Invalid option "%s" type: %O', key, data);
break;
}
}.bind(this));
} catch (ex) {
console.log('Error while loading extension options: %O', ex);
}
default:
console.warn('Invalid option "%s" type: %O', key, data);
break;
}
}.bind(this));
this.showCopyright();
this.init();
@ -113,8 +113,12 @@ Options.prototype.getValues = function() {
Options.prototype._onChange = function(event) {
var $input = $(event.target);
console.log(arguments);
this.updateOptionFromInput($input);
this.save();
};
Options.prototype.updateOptionFromInput = function($input) {
if (this.isBoolean($input)) {
this._options[this.getOptionKey($input.prop('id'))] = {
type: 'boolean',
@ -126,8 +130,6 @@ Options.prototype._onChange = function(event) {
value: $input.val()
};
}
this.save();
};
/**

4
chrome_point_plus/js/point-plus.js
View file

@ -9,7 +9,7 @@ chrome.extension.sendMessage({
* @constructor
*/
function OptionsManager(options) {
this._options = options;
this._options = options || {};
}
/**
@ -80,7 +80,7 @@ $(document).ready(function() {
// Parse webm-links and create video instead
if (options.is('option_videos_parse_links')) {
if (option.is('option_videos_parse_links_type', 'all')) {
if (options.is('option_videos_parse_links_type', 'all')) {
parse_all_videos(options);
} else {
parse_webm(options);