Merge branch 'master' of https://github.com/ejci/Chrome-Audio-EQ

ejci · Jun 21, 2015 · b0dd659 · b0dd659
2 parents c9f3626 1367544
commit b0dd659
Show file tree

Hide file tree

Showing 10 changed files with 301 additions and 255 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 1 @@
 **/Thumbs.db
diff --git a/extension/background/background.js b/extension/background/background.js
@@ -1,39 1,46 @@
-//console.log('background.js');
 /*global ChromeAudioEQ,
  chrome,
  icon,
  console
  */
 'use strict';
 
 // console.log('background.js');
 chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
  //console.log(sender.tab ? "from a content script:" sender.tab.url : "from the extension");
  //get setting from page
  if (request.action === 'get') {
  chrome.storage.local.get(function(items) {
  //console.log('background.js', 'chrome.storage.local.get', items);
  sendResponse({
- eq : items['eq'],
- config : items['config'],
- selected : items['selected'],
- version : items['version']
  eq : items.eq,
  config : items.config,
  selected : items.selected,
  version : items.version
  });
  });
 
  }
  //set settings from popup
  if (request.action === 'set') {
  var items = {};
- items['config'] = request.config;
- items['eq'] = request.eq;
- items['selected'] = request.selected;
- items['version'] = request.version;
  items.config = request.config;
  items.eq = request.eq;
  items.selected = request.selected;
  items.version = request.version;
 
  chrome.storage.local.set(items);
  //console.log(request);
  chrome.tabs.query({
  }, function(tabs) {
  function onTabMsgResp(response) {
  //console.log('tab response', response);
  }
  for (var i = 0; i < tabs.length; i ) {
- chrome.tabs.sendMessage(tabs[i].id, request, function(response) {
- //console.log('tab response', response);
- });
  chrome.tabs.sendMessage(tabs[i].id, request, onTabMsgResp);
  }
  });
- icon.generate(items['eq']);
  icon.generate(items.eq);
  }
 
  //error logger
@@ -48,14 55,14 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
 chrome.storage.local.get(function(storage) {
  //Default values
  //console.log('background.js init', 'chrome.storage.local.get', storage);
- if (storage['version'] !== CONST.VERSION) {
- storage['eq'] = CONST.EQ;
- storage['config'] = CONST.CONFIG;
- storage['version'] = CONST.VERSION;
- };
  if (storage.version !== CONST.VERSION) {
  storage.eq = CONST.EQ;
  storage.config = CONST.CONFIG;
  storage.version = CONST.VERSION;
  }
 
  chrome.storage.local.set(storage, function() {
  //console.log('background.js init', 'chrome.storage.local.set');
  });
- icon.generate(storage['eq']);
  icon.generate(storage.eq);
 });
diff --git a/extension/common/chart.js b/extension/common/chart.js
@@ -1,3 1,8 @@
 /* global window,
  document
  */
 'use strict';
 
 var chart = (function() {
  var canvas, context;
  var px = (window.devicePixelRatio > 1) ? 2 : 1;