Skip to content
This repository was archived by the owner on Feb 8, 2026. It is now read-only.

Commit 4142b47

Browse files
authored
Merge pull request #183 from joelthorner/2.x
2.3.13
2 parents 7da48ba + 76949a0 commit 4142b47

23 files changed

Lines changed: 3629 additions & 4543 deletions

css/libs/huebee.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/libs/snackbar.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/main.css

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/main.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
var gulp = require('gulp');
2+
3+
const libsJs = [
4+
'node_modules/jquery/dist/jquery.min.js',
5+
'node_modules/moment/min/moment.min.js',
6+
'node_modules/bootstrap/dist/js/bootstrap.min.js',
7+
'node_modules/hotkeys-js/dist/hotkeys.min.js',
8+
'node_modules/js-cookie/src/js.cookie.js',
9+
'node_modules/huebee/dist/huebee.pkgd.min.js',
10+
'node_modules/popper.js/dist/umd/popper.min.js',
11+
'node_modules/node-snackbar/dist/snackbar.min.js',
12+
'node_modules/sweetalert2/dist/sweetalert2.all.min.js',
13+
]
14+
15+
const scssBootstrap = [
16+
'node_modules/bootstrap/scss/**/*.scss'
17+
]
18+
19+
const libsCss = [
20+
'node_modules/huebee/dist/huebee.min.css',
21+
'node_modules/node-snackbar/dist/snackbar.min.css',
22+
]
23+
24+
gulp.task('default', function () {
25+
libsJs.forEach(libJs => {
26+
gulp.src(libJs).pipe(gulp.dest('js/libs'));
27+
});
28+
libsCss.forEach(libCss => {
29+
gulp.src(libCss).pipe(gulp.dest('css/libs'));
30+
});
31+
scssBootstrap.forEach(libScss => {
32+
gulp.src(libScss).pipe(gulp.dest('scss/bootstrap'));
33+
});
34+
});
35+
36+
// execute for update dependencies:
37+
// $ npm update
38+
// $ gulp
39+
// Execute any scss compiler (pending to do in gulp)

js/background.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ chrome.runtime.onMessage.addListener(
2020
switch (request.directive) {
2121
case 'testing-signup':
2222
executeScripts(null, [
23-
{ file: 'js/libs/moment.js' },
23+
{ file: 'js/libs/moment.min.js' },
2424
{ file: 'js/actions/testing-signup.js' }
2525
])
2626
break;
@@ -87,7 +87,7 @@ chrome.runtime.onInstalled.addListener(function (details) {
8787
// TicketConsume system
8888
function openTicketConsumeTab() {
8989
chrome.tabs.create({
90-
url: 'http://192.168.110.109:12853/zdreports/rtm.cfm/?TicketConsume=true',
90+
url: 'http://192.168.110.109:12853/zdreports/rtm.cfm?TicketConsume=true',
9191
// url: 'https://joelthorner.github.io/temp/?TicketConsume=true',
9292
active: false,
9393
// index: 0,
@@ -103,7 +103,7 @@ chrome.runtime.onMessage.addListener(function (message, sender) {
103103
tabs.forEach(tab => {
104104
chrome.tabs.sendMessage(tab.id, { data: message.data });
105105
chrome.tabs.query({
106-
url: '*://zdreports/rtm.cfm/?TicketConsume=true'
106+
url: '*://zdreports/rtm.cfm?TicketConsume=true'
107107
// url: '*://joelthorner.github.io/temp/?TicketConsume=true'
108108
}, function (tabs) {
109109
tabs.forEach(tab => { chrome.tabs.remove(tab.id) });
@@ -115,7 +115,11 @@ chrome.runtime.onMessage.addListener(function (message, sender) {
115115
chrome.tabs.onActivated.addListener(function (activeInfo) {
116116
chrome.tabs.get(activeInfo.tabId, function (tab){
117117
if (tab.url.includes("tlgcommercehelp.zendesk.com")) {
118-
openTicketConsumeTab()
118+
chrome.storage.sync.get({ optZenTicketConsume: false }, function (result) {
119+
if (result.optZenTicketConsume) {
120+
openTicketConsumeTab()
121+
}
122+
});
119123
}
120-
})
124+
});
121125
});

js/libs/hotkeys.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)