Replacing _.defer with RAF where appropriate and removing addt window…

…. references

src/js/background/application.js

@@ -40,11 +40,11 @@
         },
 
         _setInstanceId: function() {
-            var instanceId = window.localStorage.getItem('instanceId');
+            var instanceId = localStorage.getItem('instanceId');
 
             if (instanceId === null) {
                 instanceId = 'instance_' + _.now();
-                window.localStorage.setItem('instanceId', instanceId);
+                localStorage.setItem('instanceId', instanceId);
             }
 
             this.instanceId = instanceId;

src/js/background/collection/playlists.js

@@ -117,7 +117,7 @@
         _onReset: function() {
             //  Ensure there is an always active playlist by trying to load from localstorage
             if (this.length > 0 && _.isUndefined(this.getActivePlaylist())) {
-                var activePlaylistId = window.localStorage.getItem('activePlaylistId');
+                var activePlaylistId = localStorage.getItem('activePlaylistId');
 
                 //  Be sure to always have an active playlist if there is one available.
                 var playlistToSetActive = this.get(activePlaylistId) || this.at(0);
@@ -186,7 +186,7 @@
             //  Ensure only one playlist is active at a time by de-activating all other active playlists.
             if (active) {
                 this._deactivateAllExcept(changedPlaylist);
-                window.localStorage.setItem('activePlaylistId', changedPlaylist.get('id'));
+                localStorage.setItem('activePlaylistId', changedPlaylist.get('id'));
             }
         },
 
@@ -232,7 +232,7 @@
         _onRemove: function(removedPlaylist, collection, options) {
             if (removedPlaylist.get('active')) {
                 //  Clear local storage of the active playlist if it gets removed.
-                window.localStorage.setItem('activePlaylistId', null);
+                localStorage.setItem('activePlaylistId', null);
                 //  If the index of the item removed was the last one in the list, activate previous.
                 var index = options.index === this.length ? options.index - 1 : options.index;
                 this._activateByIndex(index);

src/js/background/model/clientError.js

@@ -59,10 +59,10 @@
         _getBrowserVersion: function() {
             var browserVersion = '';
 
-            var chromeMatch = window.navigator.appVersion.match(/Chrome\/(.*?) /);
+            var chromeMatch = navigator.appVersion.match(/Chrome\/(.*?) /);
             browserVersion += chromeMatch ? chromeMatch[0] : '';
 
-            var operaMatch = window.navigator.appVersion.match(/OPR\/.*/);
+            var operaMatch = navigator.appVersion.match(/OPR\/.*/);
             browserVersion += operaMatch ? operaMatch[0] : '';
 
             return browserVersion;

src/js/background/model/search.js

@@ -27,7 +27,7 @@
 
         //  The foreground has to be able to call this whenever a view opens.
         stopClearQueryTimer: function() {
-            window.clearTimeout(this.get('clearQueryTimeout'));
+            clearTimeout(this.get('clearQueryTimeout'));
             this.set('clearQueryTimeout', null);
         },
 

src/js/background/model/user.js

@@ -42,7 +42,7 @@ define(function(require) {
         },
 
         tryloadByUserId: function() {
-            var userId = window.localStorage.getItem('userId');
+            var userId = localStorage.getItem('userId');
 
             if (userId === null) {
                 this._create();

src/js/contentScript/beatport.js

@@ -93,7 +93,7 @@
         //  So, watch for a loading class being added and then removed. The new page is loaded once the class has been removed.
         this.toggleObservePageLoad = function(enable) {
             if (enable) {
-                this.pageLoadObserver = new window.MutationObserver(function(mutations) {
+                this.pageLoadObserver = new MutationObserver(function(mutations) {
                     var isPageLoading = mutations[0].target.classList.contains('loading');
 
                     if (!isPageLoading) {

src/js/contentScript/youTube.js

@@ -222,7 +222,7 @@
                 //  the page does not reload because they use AJAX to load the video page. 
                 var isPageLoaded = false;
 
-                var observer = new window.MutationObserver(function(mutations) {
+                var observer = new MutationObserver(function(mutations) {
                     var hasPageLoadedClass = mutations[0].target.classList.contains('page-loaded');
 
                     if (hasPageLoadedClass && !isPageLoaded) {

src/js/foreground/view/dialog/dialogView.js

@@ -60,7 +60,7 @@
         },
 
         onAttach: function() {
-            _.defer(this._transitionIn.bind(this));
+            requestAnimationFrame(this._transitionIn.bind(this));
         },
 
         //  Unless a dialog specifically implements reminderProperty it is assumed that reminder is enabled and the dialog will be shown when asked.

src/js/foreground/view/element/simpleMenuView.js

@@ -59,7 +59,7 @@
                 this._centerActive();
             }
 
-            _.defer(function() {
+            requestAnimationFrame(function() {
                 this.$el.addClass('is-visible');
             }.bind(this));
         },

src/js/foreground/view/stream/activeStreamItemView.js

@@ -49,7 +49,7 @@
                 this.$el.addClass('is-visible');
                 Streamus.channels.activeStreamItemArea.vent.trigger('visible');
             } else {
-                _.defer(function() {
+                requestAnimationFrame(function() {
                     this.$el.addClass('is-visible');
                 }.bind(this));