From 1057506f056e6ad63ed05651d07d39c38d558e21 Mon Sep 17 00:00:00 2001
From: isqua <isqua@isqua.ru>
Date: Mon, 5 Jan 2015 23:16:40 +0300
Subject: [PATCH] Fix first installation error

---
 chrome_point_plus/js/options.js    | 50 ++++++++++++++++--------------
 chrome_point_plus/js/point-plus.js |  4 +--
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/chrome_point_plus/js/options.js b/chrome_point_plus/js/options.js
index 13793de..bb92350 100644
--- a/chrome_point_plus/js/options.js
+++ b/chrome_point_plus/js/options.js
@@ -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();
 };
 
 /**
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 54f2f4a..58ac851 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -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);