Merge branch 'master' of bitbucket.org:skobkin/chrome_point_plus

Gruntfile.js

@@ -6,7 +6,9 @@ var vendorCopy = [
     'fancybox/source/jquery.fancybox.css',
 
     'markitup/markitup/jquery.markitup.js',
-    'markitup/markitup/skins/markitup/style.css'
+    'markitup/markitup/skins/markitup/style.css',
+
+    'soundcloud/soundcloud.player.api.js'
 ].map(function(file) {
     return {
         src: 'vendor/' + file,

bower.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "jquery": "~1.10.1",
     "fancybox": "~2.1.5",
-    "markitup": "~1.1.14"
+    "markitup": "~1.1.14",
+    "soundcloud": "git@github.com:soundcloud/Widget-JS-API.git"
   }
 }

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
-            // Setting options in DOM
+        $.each(this._options, function(key, data) {
-            $.each(data.options, function(key, data) {
+            switch (data.type) {
-                switch (data.type) {
+                case 'boolean':
-                    case 'boolean':
+                    if (data.value) {
-                        if (data.value) {
+                        $('#' + this.getOptionName(key)).prop('checked', true);
-                            $('#' + this.getOptionName(key)).prop('checked', true);
+                    }
-                        }
+                    break;
-                        break;
 
-                    case 'enum':
+                case 'enum':
-                        $('.option-node .option-enum[name="' + this.getOptionName(key) + '"][value="' + data.value + '"]').prop('checked', true);
+                    $('.option-node .option-enum[name="' + this.getOptionName(key) + '"][value="' + data.value + '"]').prop('checked', true);
-                        break;
+                    break;
 
-                    default:
+                default:
-                        console.warn('Invalid option "%s" type: %O', key, data);
+                    console.warn('Invalid option "%s" type: %O', key, data);
-                        break;
+                    break;
-                }
+            }
-            }.bind(this));
+        }.bind(this));
-        } catch (ex) {
-            console.log('Error while loading extension options: %O', ex);
-        }
 
         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();
 };
 
 /**

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);
@@ -97,7 +97,7 @@ $(document).ready(function() {
                 // Injecting JS API
                 chrome.extension.sendMessage({
                     type: 'injectJSFile',
-                    file: 'js/soundcloud/soundcloud.player.api.js'
+                    file: 'vendor/soundcloud/soundcloud.player.api.js'
                 });
 
                 // Processing links

chrome_point_plus/js/soundcloud/soundcloud.player.api.js

@@ -1,140 +0,0 @@
-/*
-*   JavaScript interface for the SoundCloud Player widget
-*   Author: Matas Petrikas, matas@soundcloud.com
-*   Copyright (c) 2009  SoundCloud Ltd.
-*   Licensed under the MIT license:
-*   http://www.opensource.org/licenses/mit-license.php
-*/
-(function(){
-  var isIE = (/msie (6|7|8)/i).test(navigator.userAgent) && !(/opera/i).test(navigator.userAgent);
-  
-  var soundcloud = window.soundcloud = {
-    version: "0.1",
-    debug: false,
-    _listeners: [],
-    // re-dispatches widget events in the DOM, using JS library support, the events also should bubble up the DOM
-    _redispatch: function(eventType, flashId, data) {
-      var playerNode,
-          lsnrs  = this._listeners[eventType] || [],
-          // construct the custom eventType  e.g. 'soundcloud:onPlayerReady'
-          customEventType = 'soundcloud:' + eventType;
-
-      try{
-        // find the flash player, might throw an exception
-        playerNode = this.getPlayer(flashId);
-      }catch(e){
-        if(this.debug && window.console){
-          console.error('unable to dispatch widget event ' + eventType + ' for the widget id ' + flashId, data, e);
-        }
-        return;
-      }
-      // re-dispatch SoundCloud events up in the DOM
-      if(window.jQuery){
-        // if jQuery is available, trigger the custom event
-        jQuery(playerNode).trigger(customEventType, [data]);
-      }else if(window.Prototype){
-        // if Prototype.js is available, fire the custom event
-        $(playerNode).fire(customEventType, data);
-      }else{
-        // TODO add more JS libraries that support custom DOM events
-      }
-      // if there are any listeners registered to this event, trigger them all
-      for(var i = 0, l = lsnrs.length; i < l; i += 1) {
-        lsnrs[i].apply(playerNode, [playerNode, data]);
-      }
-      // log the events in debug mode
-      if(this.debug && window.console){
-        console.log(customEventType, eventType, flashId, data);
-      }
-
-    },
-    // you can add multiple listeners to a certain event
-    // e.g. soundcloud.addEventListener('onPlayerReady', myFunctionOne);
-    //      soundcloud.addEventListener('onPlayerReady', myFunctionTwo);
-    addEventListener: function(eventType, callback) {
-      if(!this._listeners[eventType]){
-        this._listeners[eventType] = [];
-      }
-      this._listeners[eventType].push(callback);
-    },
-    // you can also remove the function listener if e.g you want to trigger it only once
-    // soundcloud.removeEventListener('onMediaPlay', myFunctionOne);
-    removeEventListener: function(eventType, callback) {
-      var lsnrs = this._listeners[eventType] || [];
-      for(var i = 0, l = lsnrs.length; i < l; i += 1) {
-        if(lsnrs[i] === callback){
-          lsnrs.splice(i, 1);
-        }
-      }
-    },
-    // get widget node based on its id (if object tag) or name (if embed tag)
-    // if you're using SWFObject or other dynamic Flash generators, please make sure that you set the id parameter
-    //  only if the DOM has an id/name it's possible to call player's methods.
-    // Important!: because of the bug in Opera browser, the Flash can't get its own id
-    // so the generator should set it additionally through flashvars parameter 'object_id'
-    getPlayer: function(id){
-      var flash;
-      try{
-        if(!id){
-          throw "The SoundCloud Widget DOM object needs an id atribute, please refer to SoundCloud Widget API documentation.";
-        }
-        flash = isIE ? window[id] : document[id];
-        if(flash){
-          if(flash.api_getFlashId){
-            return flash;
-          }else{
-            throw "The SoundCloud Widget External Interface is not accessible. Check that allowscriptaccess is set to 'always' in embed code";
-          }
-        }else{
-          throw "The SoundCloud Widget with an id " + id + " couldn't be found";
-        }
-      }catch(e){
-        if (console && console.error) {
-         console.error(e);
-        }
-        throw e;
-      }
-    },
-    // fired when widget has loaded its data and is ready to accept calls from outside
-    // the widget will call these functions only if in it's flashvars there's a parameter enable_api=true
-    // @flashId: the widget id, basically the Flash node should be accessible to JS with soundcloud.getPlayer(flashId)
-    // @data: an object containing .mediaUri (eg. 'http://api.soundcloud.com/tracks/49931') .mediaId (e.g. '4532')
-    // in buffering events data contains also .percent = (e.g. '99')
-    onPlayerReady: function(flashId, data) {
-      this._redispatch('onPlayerReady', flashId, data);
-    },
-    // fired when widget starts playing current track (fired only once per track)
-    onMediaStart : function(flashId, data) {
-      this._redispatch('onMediaStart', flashId, data);
-    },
-    // fired when the track/playlist has finished playing
-    onMediaEnd : function(flashId, data) {
-      this._redispatch('onMediaEnd', flashId, data);
-    },
-    // fired when widget starts playing current track (fired on every play, seek)
-    onMediaPlay : function(flashId, data) {
-      this._redispatch('onMediaPlay', flashId, data);
-    },
-    // fired when track was paused
-    onMediaPause : function(flashId, data) {
-      this._redispatch('onMediaPause', flashId, data);
-    },
-    // fired when the widget is still buffering, means you can't seek in the track fully yet
-    onMediaBuffering : function(flashId, data) {
-      this._redispatch('onMediaBuffering', flashId, data);
-    },
-    // fired when the user seeks in the track
-    onMediaSeek : function(flashId, data) {
-      this._redispatch('onMediaSeek', flashId, data);
-    },
-    // fired when the widget is done buffering and the whole track length is seekable
-    onMediaDoneBuffering : function(flashId, data) {
-      this._redispatch('onMediaDoneBuffering', flashId, data);
-    },
-    // fired when the widget can't get the requested data from the server (the resource is removed, hidden, etc.)
-    onPlayerError : function(flashId, data) {
-      this._redispatch('onPlayerError', flashId, data);
-    }
-  };
-  
-})();