Skip to content

Commit

Permalink
Merge pull request #11 from LPauzies/upgrade/version.2.2.0
Browse files Browse the repository at this point in the history 
Upgrade/version.2.2.0
  • Loading branch information
@LPauzies
LPauzies authored Mar 9, 2022
2 parents b50818a + abe7f23 commit dbab578
Show file tree
Hide file tree
Showing 19 changed files with 473 additions and 342 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ build
dist
node_modules
tmp
.env
23 changes: 11 additions & 12 deletions chrome/common/lib/constants.js
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
(function (){

(function () {
var root = this;

var constants = {
twitchApi: {
api : "https://id.twitch.tv/oauth2/authorize",
response_type: 'token',
client_id : 'nhrhocc8g5gfm8w98oi9ozuuo4ser2',
client_secret: '2ovjqj5of99gpmkdjyiyyz6mgvdo79',
scope : 'openid user:read:follows user:read:email',
redirect_uri : 'https://ndragomirov.github.io/twitch.html'
}
api: "https://id.twitch.tv/oauth2/authorize",
response_type: "token",
client_id: "nhrhocc8g5gfm8w98oi9ozuuo4ser2",
client_secret: "",
scope: "openid user:read:follows user:read:email",
redirect_uri: "https://ndragomirov.github.io/twitch.html",
},
};

if ( typeof exports !== 'undefined' ) {
if ( typeof module !== 'undefined' && module.exports ) {
if (typeof exports !== "undefined") {
if (typeof module !== "undefined" && module.exports) {
exports = module.exports = constants;
}
exports.constants = constants;
} else {
root.constants = constants;
}
}).call(this);
}.call(this));
118 changes: 59 additions & 59 deletions chrome/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
{
"name": "Twitch Companion",
"version": "2.1.0",
"default_locale": "en",
"manifest_version": 2,
"description": "Access quickly to your favorite streams and search them by games. Be notified by popup of which one of your favorite streamers are online. Fully customizable application through parameters tab.",
"content_scripts": [
{
"run_at": "document_start",
"matches": [
"*://*.twitch.tv/*"
],
"all_frames": true,
"js": [
"common/content/theatre-mode.js"
]
}
],
"background": {
"scripts": [
"common/lib/constants.js",
"common/dist/contributors.js",
"common/lib/3rd/async.js",
"common/lib/3rd/jquery.js",
"common/lib/3rd/underscore.js",
"common/lib/3rd/backbone.js",
"common/lib/3rd/backbone.memento.js",
"common/lib/3rd/backbone.mixin.js",
"common/lib/3rd/eventemitter.js",
"common/lib/utils.js",
"common/lib/oauth2.js",
"background.js",
"common/lib/twitch-api.js",
"common/lib/onerror.js",
"common/lib/app.js"
"name": "Twitch Companion",
"version": "2.2.0",
"default_locale": "en",
"manifest_version": 2,
"description": "Access quickly to your favorite streams and search them by games. Be notified by popup of which one of your favorite streamers are online. Fully customizable application through parameters tab.",
"content_scripts": [
{
"run_at": "document_start",
"matches": [
"*://*.twitch.tv/*"
],
"all_frames": true,
"js": [
"common/content/theatre-mode.js"
]
}
],
"persistent": true
},
"minimum_chrome_version": "1.1.142",
"icons": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png",
"64": "common/icons/64.png",
"128": "common/icons/128.png"
},
"browser_action": {
"default_icon": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png"
"background": {
"scripts": [
"common/lib/constants.js",
"common/dist/contributors.js",
"common/lib/3rd/async.js",
"common/lib/3rd/jquery.js",
"common/lib/3rd/underscore.js",
"common/lib/3rd/backbone.js",
"common/lib/3rd/backbone.memento.js",
"common/lib/3rd/backbone.mixin.js",
"common/lib/3rd/eventemitter.js",
"common/lib/utils.js",
"common/lib/oauth2.js",
"background.js",
"common/lib/twitch-api.js",
"common/lib/onerror.js",
"common/lib/app.js"
],
"persistent": true
},
"default_popup": "common/html/popup.html"
},
"permissions": [
"storage",
"background",
"*://*.twitch.tv/*",
"*://ndragomirov.github.io/*",
"notifications",
"tabs"
]
"minimum_chrome_version": "1.1.142",
"icons": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png",
"64": "common/icons/64.png",
"128": "common/icons/128.png"
},
"browser_action": {
"default_icon": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png"
},
"default_popup": "common/html/popup.html"
},
"permissions": [
"storage",
"background",
"*://*.twitch.tv/*",
"*://ndragomirov.github.io/*",
"notifications",
"tabs"
]
}
4 changes: 2 additions & 2 deletions common/html/popup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ <h2 class="header">__MSG_m77__</h2>

<div>
<!--<a class="js-tab" data-href="https://chrome.google.com/webstore/detail/twitch-companion/nlmbdmpjmlijibeockamioakdpmhjnpk">__MSG_m78__</a>
<a class="js-tab" data-href="https://addons.opera.com/extensions/details/twitch-companion/">__MSG_m79__</a>
<a class="js-tab" data-href="https://addons.mozilla.org/firefox/addon/twitch-companion/">__MSG_m80__</a>-->
<a class="js-tab" data-href="https://addons.opera.com/extensions/details/twitch-companion/">__MSG_m79__</a>-->
<a class="js-tab" data-href="https://addons.mozilla.org/firefox/addon/twitch-companion/">__MSG_m80__</a>
</div>
</div>

Expand Down
39 changes: 19 additions & 20 deletions firefox/common/lib/constants.js
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
(function () {
var root = this;

var root = this;
var constants = {
twitchApi: {
api: "https://id.twitch.tv/oauth2/authorize",
response_type: "token",
client_id: "nhrhocc8g5gfm8w98oi9ozuuo4ser2",
client_secret: "",
scope: "openid user:read:follows user:read:email",
redirect_uri: "https://ndragomirov.github.io/twitch-firefox.html",
},
};

var constants = {
twitchApi: {
api: "https://id.twitch.tv/oauth2/authorize",
response_type: 'token',
client_id: 'nhrhocc8g5gfm8w98oi9ozuuo4ser2',
client_secret: '2ovjqj5of99gpmkdjyiyyz6mgvdo79',
scope: 'openid user:read:follows user:read:email',
redirect_uri: 'https://ndragomirov.github.io/twitch-firefox.html'
}
};

if (typeof exports !== 'undefined') {
if (typeof module !== 'undefined' && module.exports) {
exports = module.exports = constants;
}
exports.constants = constants;
} else {
root.constants = constants;
if (typeof exports !== "undefined") {
if (typeof module !== "undefined" && module.exports) {
exports = module.exports = constants;
}
}).call(this);
exports.constants = constants;
} else {
root.constants = constants;
}
}.call(this));
116 changes: 58 additions & 58 deletions firefox/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
{
"name": "Twitch Companion",
"version": "2.1.0",
"default_locale": "en",
"manifest_version": 2,
"description": "Access quickly to your favorite streams and search them by games. Be notified by popup of which one of your favorite streamers are online. Fully customizable application through parameters tab.",
"content_scripts": [
{
"run_at": "document_start",
"matches": [
"*://*.twitch.tv/*"
],
"all_frames": true,
"js": [
"common/content/theatre-mode.js"
]
}
],
"background": {
"scripts": [
"common/lib/constants.js",
"common/dist/contributors.js",
"common/lib/3rd/async.js",
"common/lib/3rd/jquery.js",
"common/lib/3rd/underscore.js",
"common/lib/3rd/backbone.js",
"common/lib/3rd/backbone.memento.js",
"common/lib/3rd/backbone.mixin.js",
"common/lib/3rd/eventemitter.js",
"common/lib/utils.js",
"common/lib/oauth2.js",
"background.js",
"common/lib/twitch-api.js",
"common/lib/onerror.js",
"common/lib/app.js"
"name": "Twitch Companion",
"version": "2.2.0",
"default_locale": "en",
"manifest_version": 2,
"description": "Access quickly to your favorite streams and search them by games. Be notified by popup of which one of your favorite streamers are online. Fully customizable application through parameters tab.",
"content_scripts": [
{
"run_at": "document_start",
"matches": [
"*://*.twitch.tv/*"
],
"all_frames": true,
"js": [
"common/content/theatre-mode.js"
]
}
],
"persistent": true
},
"minimum_chrome_version": "1.1.142",
"icons": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png",
"64": "common/icons/64.png",
"128": "common/icons/128.png"
},
"browser_action": {
"default_icon": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png"
"background": {
"scripts": [
"common/lib/constants.js",
"common/dist/contributors.js",
"common/lib/3rd/async.js",
"common/lib/3rd/jquery.js",
"common/lib/3rd/underscore.js",
"common/lib/3rd/backbone.js",
"common/lib/3rd/backbone.memento.js",
"common/lib/3rd/backbone.mixin.js",
"common/lib/3rd/eventemitter.js",
"common/lib/utils.js",
"common/lib/oauth2.js",
"background.js",
"common/lib/twitch-api.js",
"common/lib/onerror.js",
"common/lib/app.js"
],
"persistent": true
},
"default_popup": "common/html/popup.html"
},
"permissions": [
"storage",
"https://*/*",
"http://*/*",
"notifications",
"tabs"
]
"minimum_chrome_version": "1.1.142",
"icons": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png",
"64": "common/icons/64.png",
"128": "common/icons/128.png"
},
"browser_action": {
"default_icon": {
"16": "common/icons/16.png",
"32": "common/icons/32.png",
"48": "common/icons/48.png"
},
"default_popup": "common/html/popup.html"
},
"permissions": [
"storage",
"https://*/*",
"http://*/*",
"notifications",
"tabs"
]
}
Loading

0 comments on commit dbab578

Please sign in to comment.