@@ -158,24 +158,20 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
158
158
159
159
chrome . browserAction . onClicked . addListener ( function ( e ) {
160
160
var lastPlayingTabId = parseInt ( DataStorage . get ( 'lastPlayingTabId' ) ) ,
161
- lastPlayingFrameId = parseInt ( DataStorage . get ( 'lastPlayingFrameId' ) ) ,
161
+ lastPlayingFrameId = parseInt ( DataStorage . get ( 'lastPlayingFrameId' ) ) | 0 ,
162
162
lastPausedTabId = parseInt ( DataStorage . get ( 'lastPausedTabId' ) ) ,
163
- lastPausedFrameId = parseInt ( DataStorage . get ( 'lastPausedFrameId' ) ) ,
163
+ lastPausedFrameId = parseInt ( DataStorage . get ( 'lastPausedFrameId' ) ) | 0 ,
164
164
status = DataStorage . get ( 'status' ) ;
165
165
166
166
switch ( status ) {
167
167
case "playing" :
168
168
if ( lastPlayingTabId ) {
169
- if ( ! lastPlayingFrameId )
170
- lastPlayingFrameId = 0 ;
171
169
chrome . tabs . sendMessage ( lastPlayingTabId , { action : 'pause' } , { frameId : lastPlayingFrameId } ) ;
172
170
}
173
171
break ;
174
172
175
173
case "paused" :
176
174
if ( lastPlayingTabId ) {
177
- if ( ! lastPausedFrameId )
178
- lastPausedFrameId = 0 ;
179
175
chrome . tabs . sendMessage ( lastPausedTabId , { action : 'play' } , { frameId : lastPausedFrameId } ) ;
180
176
}
181
177
break ;
@@ -184,7 +180,7 @@ chrome.browserAction.onClicked.addListener(function(e) {
184
180
185
181
chrome . runtime . onMessage . addListener ( function ( request , sender , sendResponse ) {
186
182
var lastPlayingTabId = parseInt ( DataStorage . get ( 'lastPlayingTabId' ) ) ,
187
- lastPlayingFrameId = parseInt ( DataStorage . get ( 'lastPlayingFrameId' ) ) ,
183
+ lastPlayingFrameId = parseInt ( DataStorage . get ( 'lastPlayingFrameId' ) ) | 0 ,
188
184
lastPausedTabId = parseInt ( DataStorage . get ( 'lastPausedTabId' ) ) ,
189
185
status = DataStorage . get ( 'status' ) ;
190
186
@@ -198,10 +194,8 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
198
194
break ;
199
195
200
196
case 'started' :
201
- var isFrameIdChanged = ( lastPlayingTabId && lastPlayingFrameId && sender . frameId != lastPlayingFrameId ) ;
197
+ var isFrameIdChanged = ( lastPlayingTabId && sender . frameId != lastPlayingFrameId ) ;
202
198
if ( lastPlayingTabId && sender . tab . id != lastPlayingTabId || isFrameIdChanged ) {
203
- if ( ! lastPlayingFrameId )
204
- lastPlayingFrameId = 0 ;
205
199
chrome . tabs . sendMessage ( lastPlayingTabId , { action : 'pause' } , { frameId : lastPlayingFrameId } ) ;
206
200
}
207
201
DataStorage . set ( 'lastPlayingTabId' , sender . tab . id ) ;
@@ -236,10 +230,8 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
236
230
chrome . commands . onCommand . addListener ( function ( command ) {
237
231
var lastPlayingTabId = parseInt ( DataStorage . get ( 'lastPlayingTabId' ) ) ,
238
232
lastPausedTabId = parseInt ( DataStorage . get ( 'lastPausedTabId' ) ) ,
239
- lastPausedFrameId = parseInt ( DataStorage . get ( 'lastPausedFrameId' ) ) ,
233
+ lastPausedFrameId = parseInt ( DataStorage . get ( 'lastPausedFrameId' ) ) | 0 ,
240
234
status = DataStorage . get ( 'status' ) ;
241
- if ( ! lastPausedFrameId )
242
- lastPausedFrameId = 0 ;
243
235
if ( lastPlayingTabId ) {
244
236
var action = ( status == 'playing' ) ? 'pause' : 'play' ;
245
237
chrome . tabs . sendMessage ( lastPlayingTabId , { action : action } , { frameId : lastPausedFrameId } ) ;
@@ -248,9 +240,7 @@ chrome.commands.onCommand.addListener(function(command) {
248
240
chrome . tabs . onRemoved . addListener ( function ( tabId ) {
249
241
var lastPlayingTabId = parseInt ( DataStorage . get ( 'lastPlayingTabId' ) ) ,
250
242
lastPausedTabId = parseInt ( DataStorage . get ( 'lastPausedTabId' ) ) ,
251
- lastPausedFrameId = parseInt ( DataStorage . get ( 'lastPausedFrameId' ) ) ;
252
- if ( ! lastPausedFrameId )
253
- lastPausedFrameId = 0 ;
243
+ lastPausedFrameId = parseInt ( DataStorage . get ( 'lastPausedFrameId' ) ) | 0 ;
254
244
if ( tabId == lastPlayingTabId ) {
255
245
DataStorage . set ( 'lastPlayingTabId' , null ) ;
256
246
if ( lastPausedTabId != tabId ) {
0 commit comments