Skip to content

Modified popup.js, background.js etc for fixes. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fastcodejava wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Modified popup.js, background.js etc for fixes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
00b0604
Modified popup.js, background.js etc for fixes.
fastcodejava Dec 1, 2017
cca16e2
Modified popup.js, background.js etc for fixes.
fastcodejava Dec 11, 2017
7940430
Modified popup.js, background.js etc for fixes.
fastcodejava Jan 2, 2018
cd83699
Modified popup.js, background.js etc for fixes.
fastcodejava Jan 3, 2018
b7b6f23
Update popup.js
fastcodejava Jan 5, 2018
59db6b1
Modified popup.js, background.js etc for fixes.
fastcodejava Feb 5, 2018
7e067e3
Merge remote-tracking branch 'origin/develop1' into develop1
fastcodejava Feb 5, 2018
5f34c62
Update popup.js
fastcodejava Apr 26, 2018
05eb1cd
Update popup.html
fastcodejava Apr 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
308 changes: 172 additions & 136 deletions background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/**
* Created by gdev on 3/19/2017.
*/
var highlightTabs;
var highlightTabs;
var tabsBackground;
var currWindow;
var timeOut;
var lastTab;
var urls = [];
var tabToHilite;
var openAt;
var firstPage;
var firstPage = "";
var invokedWind;
var startTime;
var pagesToOpen = [];
Expand All @@ -20,19 +20,23 @@ var options = ['tabsBackground', 'highlightTabs', 'timeOut', 'tabToLoad'];


var loading_images = ['ajax-loader_LB.gif',
'ajax-loader_LT.gif',
'ajax-loader_RT.gif',
'ajax-loader_RB.gif'];

'ajax-loader_LT.gif',
'ajax-loader_RT.gif',
'ajax-loader_RB.gif'];
var image_index = 0;
var tabLoadTimeout = 60;

var keep_switching_icon;
function rotateIcon(rotate)
{
{
keep_switching_icon = rotate === undefined ? keep_switching_icon : rotate;
const image = keep_switching_icon ? "icons/" + loading_images[image_index] : "icons/ic_title_black_24dp_1x.png";
chrome.browserAction.setIcon({path: image});
//console.log("currWindow--" + currWindow + "---" + invokedWind);
//if (currWindow === invokedWind) {
chrome.browserAction.setIcon({path: image});
//}

image_index = (image_index + 1) % loading_images.length;

if ( keep_switching_icon )
Expand All @@ -41,83 +45,101 @@ function rotateIcon(rotate)
}
}
chrome.storage.sync.get( options, function(items) {
highlightTabs = items.highlightTabs;
tabsBackground = items.tabsBackground;
timeOut = items.timeOut * 1000;
tabToLoad = items.tabToLoad;
console.log("time out--" + tabToLoad);
highlightTabs = items.highlightTabs;
tabsBackground = items.tabsBackground;
timeOut = items.timeOut * 1000;
tabToLoad = items.tabToLoad;
console.log("time out--" + tabToLoad);
});
chrome.windows.getCurrent(function(win){
currWindow = win.id;
});

chrome.storage.sync.get(function(data) {
console.log("data sync " + JSON.stringify(data));
});
console.log("data sync " + JSON.stringify(data));
});
chrome.storage.onChanged.addListener(function(changes, area) {
console.log("in bkgd page" + JSON.stringify(changes));
//console.log("currWindow from bkg" + currWindow);

console.log("in bkgd page" + JSON.stringify(changes));
//console.log("currWindow from bkg" + currWindow);
if (area == "sync" && "urlsToOpen" in changes) {
urls = changes.urlsToOpen.newValue;
if (typeof urls != "undefined" && urls !== null && urls.length > 0) {
pagesToOpen = urls;
tabToHilite = [changes.currTab.newValue.index];
openAt = changes.currTab.newValue.index;
invokedWind = changes.invokedWindow.newValue;
console.log("invoked from " + invokedWind + "\n urls-" + urls.length);
console.log("list of urls to open--" + urls);
if (!changes.opnSmeTb.newValue) {
if (Array.isArray(urls)) {
currentTask = true;
openAt ++;
startTime = new Date().getTime();
chrome.tabs.create({url: urls[0], active : !tabsBackground, index: parseInt(openAt), windowId : invokedWind}, function(tab){
tabToHilite.push(tab.index);
openAt ++;
//console.log(JSON.stringify(tab));
firstPage = tab.id;
lastTab = tab.id;
console.log("reset" + openAt + urls[0]);
// chrome.browserAction.setIcon({path:"icons/ajax-loader.gif"});
//keep_switching_icon = true;
//console.log(keep_switching_icon);
rotateIcon(true);
chrome.tabs.onRemoved.addListener(function (tabId , info) {
if (tabId === lastTab) {
chrome.storage.sync.set({loading: false}, function() {});
rotateIcon(false);
}
});

});
} else {
openAt ++;
chrome.tabs.create({url: urls, active : !tabsBackground, index: parseInt(openAt), windowId : invokedWind}, function(tab){
tabToHilite.push(tab.index);
});
chrome.storage.sync.set({loading: false}, function() {});
}
} else {
chrome.tabs.update(changes.currTab.newValue.id, {url: urls[0]});
chrome.storage.sync.set({loading: false}, function() {});
}

if (highlightTabs) {
chrome.tabs.highlight({tabs: tabToHilite, windowId: invokedWind}, function(){
if (chrome.runtime.error) {
console.log("Runtime error.");
}
});
}

}
chrome.storage.sync.set({urlsToOpen: [], currTab : "", invokedWindow : "", opnSmeTb : ""}, function() {});
}
if (chrome.runtime.error) {
console.log("ddd Runtime error.");
urls = changes.urlsToOpen.newValue;
if (typeof urls != "undefined" && urls !== null && urls.length > 0) {
pagesToOpen = urls;
tabToHilite = [changes.currTab.newValue.index];
openAt = changes.currTab.newValue.index;
invokedWind = changes.invokedWindow.newValue;
console.log("invoked from " + invokedWind + "\n urls-" + urls.length);
console.log("list of urls to open--" + urls);
console.log(tabToLoad);
if (!changes.opnSmeTb.newValue) {
if (Array.isArray(urls)) {
currentTask = true;
openAt ++;
startTime = new Date().getTime();
//var url = urls[0];
var loopLimit = urls.length < parseInt(tabToLoad) ? urls.length : parseInt(tabToLoad);
for (var x = 0;x < loopLimit; x++) {
console.log("link----------------" + urls[x]);
url = urls[x];
chrome.tabs.create({url: url, active : !tabsBackground, index: parseInt(openAt), windowId : invokedWind}, function(tab){
tabToHilite.push(tab.index);
//openAt ++;

//pagesToOpen.shift();
//console.log(JSON.stringify(tab));
if (firstPage === "") {
console.log("x equal to zero");
firstPage = tab.id;

}
lastTab = tab.id;
console.log("reset" + openAt + url);
// chrome.browserAction.setIcon({path:"icons/ajax-loader.gif"});
//keep_switching_icon = true;
//console.log(keep_switching_icon);
rotateIcon(true);

chrome.tabs.onRemoved.addListener(function (tabId , info) {
if (tabId === lastTab) {
chrome.storage.sync.set({loading: false}, function() {});
rotateIcon(false);
//chrome.browserAction.setIcon({path: "icons/ic_title_black_24dp_1x.png", tabId : tabId});
}
});

});
openAt ++;

}

} else {
openAt ++;
chrome.tabs.create({url: urls, active : !tabsBackground, index: parseInt(openAt), windowId : invokedWind}, function(tab){
tabToHilite.push(tab.index);
});
chrome.storage.sync.set({loading: false}, function() {});
}
} else {
chrome.tabs.update(changes.currTab.newValue.id, {url: urls[0]});
chrome.storage.sync.set({loading: false}, function() {});
}

if (highlightTabs) {
chrome.tabs.highlight({tabs: tabToHilite, windowId: invokedWind}, function(){
if (chrome.runtime.error) {
console.log("Runtime error.");
}
});
}

}
chrome.storage.sync.set({urlsToOpen: [], currTab : "", invokedWindow : "", opnSmeTb : ""}, function() {});
}

if (chrome.runtime.error) {
console.log("ddd Runtime error.");
}

});

var parentUrl = "";
Expand All @@ -132,74 +154,88 @@ var parentTitle = "";
});*/

chrome.tabs.onUpdated.addListener(function(tabId , changeInfo, info) {
console.log("Test " + tabId + "--" + JSON.stringify(info) + "--" + JSON.stringify(changeInfo));
if (parentUrl === "") {
parentUrl = info.url;
parentTitle = info.title;
//chrome.storage.sync.set({parentUrl: parentUrl}, function() {});
}

console.log("urls ln" + pagesToOpen.length);
if (info.status === "loading" && tabId === lastTab) {
var now = new Date().getTime();
console.log(now - startTime);
console.log(timeOut);
if (now - startTime > timeOut) {
chrome.browserAction.setIcon({path:"icons/ic_title_black_24dp_1x.png"});
chrome.storage.sync.set({loading: false}, function() {});
rotateIcon(false);
currentTask = false;
}
}
console.log(lastTab + "--tt--" + openAt);

if (currentTask) {
if (info.status === "complete" && tabId === lastTab && pagesToOpen.length > 1) {
console.log("firstPage--" + firstPage);
if (firstPage !== "") {
chrome.tabs.update(firstPage, {active: true});
firstPage = "";
}
console.log("k is-" + k);
if (k === parseInt(tabToLoad)) {
console.log("k is 2" + new Date().getTime());
k = 0;
}
for ( ;k < parseInt(tabToLoad); k++) {
console.log("k inside for--" + k + "---" + new Date().getTime());
pagesToOpen.shift();
chrome.tabs.create({url: pagesToOpen[0], active : false, index: parseInt(openAt), windowId : invokedWind}, function(tab) {
lastTab = tab.id;
tabToHilite.push(tab.index);
openAt ++;
});
if (pagesToOpen.length == 1) {
return;
}
}

}
if (info.status === "complete" && tabId === lastTab && pagesToOpen.length == 1) {
chrome.browserAction.setIcon({path:"icons/ic_title_black_24dp_1x.png"});
//chrome.runtime.sendMessage({msg: "completed"}, function(response) {});
chrome.storage.sync.set({loading: false}, function() {});
//keep_switching_icon = false;
rotateIcon(false);
currentTask = false;
}
}
console.log("Test " + tabId + "--" + JSON.stringify(info) + "--" + JSON.stringify(changeInfo));
if (parentUrl === "") {
parentUrl = info.url;
parentTitle = info.title;
//chrome.storage.sync.set({parentUrl: parentUrl}, function() {});
}

console.log("urls ln" + pagesToOpen.length);
if (info.status === "loading" && tabId === lastTab) {
var now = new Date().getTime();
console.log(now - startTime);
console.log(timeOut);
if (now - startTime > timeOut) {
chrome.browserAction.setIcon({path:"icons/ic_title_black_24dp_1x.png"});
chrome.storage.sync.set({loading: false}, function() {});
rotateIcon(false);
currentTask = false;
}
}
console.log(lastTab + "--tt--" + openAt);

if (currentTask) {
if (info.status === "complete" && tabId === lastTab && pagesToOpen.length > 1) {
console.log("firstPage--" + firstPage);
if (firstPage !== "") {
chrome.tabs.update(firstPage, {active: true});
firstPage = "";
console.log("before-------------" + pagesToOpen.length);
for (var i = 0 ; i < parseInt(tabToLoad) - 1; i ++) {
pagesToOpen.shift();
}
console.log("after-------------" + pagesToOpen.length);
}
console.log("k is-" + k);
if (k === parseInt(tabToLoad)) {
console.log("k is 2" + new Date().getTime());
k = 0;
}

for ( ;k < parseInt(tabToLoad); k++) {
console.log("k inside for--" + k + "---" + new Date().getTime() + "--------" + pagesToOpen[0]);
pagesToOpen.shift();
console.log(pagesToOpen.length);
if (pagesToOpen.length > 0 ){
chrome.tabs.create({url: pagesToOpen[0], active : false, index: parseInt(openAt), windowId : invokedWind}, function(tab) {
lastTab = tab.id;
tabToHilite.push(tab.index);
//openAt ++;
});
}

openAt ++;
if (pagesToOpen.length === 1) {
return;
}
}

}
if (info.status === "complete" && tabId === lastTab && pagesToOpen.length <= 1) {
console.log("current task done...");
chrome.browserAction.setIcon({path:"icons/ic_title_black_24dp_1x.png"});
//chrome.runtime.sendMessage({msg: "completed"}, function(response) {});
chrome.storage.sync.set({loading: false}, function() {});
//keep_switching_icon = false;
rotateIcon(false);
currentTask = false;
}
}

});

/*
chrome.browserAction.onClicked.addListener(function(tab) {
console.log("call adi");
//chrome.tabs.executeScript(null, {file: "content_script.js"});
chrome.tabs.executeScript({file: "./popup.js"});


});*/

/*
chrome.runtime.onMessage.addListener(function(req, sender, sendres){
console.log("in lstnr");


});*/
Loading