Skip to content

Commit bcfbb66

Browse files
committed
code-review fixes #44
1 parent ded60bf commit bcfbb66

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

background.js

+6-16
Original file line numberDiff line numberDiff line change
@@ -158,24 +158,20 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
158158

159159
chrome.browserAction.onClicked.addListener(function(e) {
160160
var lastPlayingTabId = parseInt(DataStorage.get('lastPlayingTabId')),
161-
lastPlayingFrameId = parseInt(DataStorage.get('lastPlayingFrameId')),
161+
lastPlayingFrameId = parseInt(DataStorage.get('lastPlayingFrameId')) | 0,
162162
lastPausedTabId = parseInt(DataStorage.get('lastPausedTabId')),
163-
lastPausedFrameId = parseInt(DataStorage.get('lastPausedFrameId')),
163+
lastPausedFrameId = parseInt(DataStorage.get('lastPausedFrameId')) | 0,
164164
status = DataStorage.get('status');
165165

166166
switch(status) {
167167
case "playing":
168168
if(lastPlayingTabId) {
169-
if(!lastPlayingFrameId)
170-
lastPlayingFrameId = 0;
171169
chrome.tabs.sendMessage(lastPlayingTabId, {action: 'pause'}, {frameId: lastPlayingFrameId});
172170
}
173171
break;
174172

175173
case "paused":
176174
if(lastPlayingTabId) {
177-
if(!lastPausedFrameId)
178-
lastPausedFrameId = 0;
179175
chrome.tabs.sendMessage(lastPausedTabId, {action: 'play'}, {frameId: lastPausedFrameId});
180176
}
181177
break;
@@ -184,7 +180,7 @@ chrome.browserAction.onClicked.addListener(function(e) {
184180

185181
chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
186182
var lastPlayingTabId = parseInt(DataStorage.get('lastPlayingTabId')),
187-
lastPlayingFrameId = parseInt(DataStorage.get('lastPlayingFrameId')),
183+
lastPlayingFrameId = parseInt(DataStorage.get('lastPlayingFrameId')) | 0,
188184
lastPausedTabId = parseInt(DataStorage.get('lastPausedTabId')),
189185
status = DataStorage.get('status');
190186

@@ -198,10 +194,8 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
198194
break;
199195

200196
case 'started':
201-
var isFrameIdChanged = (lastPlayingTabId && lastPlayingFrameId && sender.frameId != lastPlayingFrameId);
197+
var isFrameIdChanged = (lastPlayingTabId && sender.frameId != lastPlayingFrameId);
202198
if(lastPlayingTabId && sender.tab.id != lastPlayingTabId || isFrameIdChanged) {
203-
if(!lastPlayingFrameId)
204-
lastPlayingFrameId = 0;
205199
chrome.tabs.sendMessage(lastPlayingTabId, {action: 'pause'}, {frameId: lastPlayingFrameId});
206200
}
207201
DataStorage.set('lastPlayingTabId', sender.tab.id);
@@ -236,10 +230,8 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
236230
chrome.commands.onCommand.addListener(function(command) {
237231
var lastPlayingTabId = parseInt(DataStorage.get('lastPlayingTabId')),
238232
lastPausedTabId = parseInt(DataStorage.get('lastPausedTabId')),
239-
lastPausedFrameId = parseInt(DataStorage.get('lastPausedFrameId')),
233+
lastPausedFrameId = parseInt(DataStorage.get('lastPausedFrameId')) | 0,
240234
status = DataStorage.get('status');
241-
if(!lastPausedFrameId)
242-
lastPausedFrameId = 0;
243235
if(lastPlayingTabId) {
244236
var action = (status == 'playing') ? 'pause' : 'play';
245237
chrome.tabs.sendMessage(lastPlayingTabId, {action: action}, {frameId: lastPausedFrameId});
@@ -248,9 +240,7 @@ chrome.commands.onCommand.addListener(function(command) {
248240
chrome.tabs.onRemoved.addListener(function(tabId){
249241
var lastPlayingTabId = parseInt(DataStorage.get('lastPlayingTabId')),
250242
lastPausedTabId = parseInt(DataStorage.get('lastPausedTabId')),
251-
lastPausedFrameId = parseInt(DataStorage.get('lastPausedFrameId'));
252-
if(!lastPausedFrameId)
253-
lastPausedFrameId = 0;
243+
lastPausedFrameId = parseInt(DataStorage.get('lastPausedFrameId')) | 0;
254244
if(tabId == lastPlayingTabId) {
255245
DataStorage.set('lastPlayingTabId', null);
256246
if(lastPausedTabId != tabId) {

0 commit comments

Comments
 (0)