Merge pull request #183 from joelthorner/2.x

2.3.13

gulpfile.js

@@ -0,0 +1,39 @@
+var gulp = require('gulp');
+
+const libsJs = [
+	'node_modules/jquery/dist/jquery.min.js',
+	'node_modules/moment/min/moment.min.js',
+	'node_modules/bootstrap/dist/js/bootstrap.min.js',
+	'node_modules/hotkeys-js/dist/hotkeys.min.js',
+	'node_modules/js-cookie/src/js.cookie.js',
+	'node_modules/huebee/dist/huebee.pkgd.min.js',
+	'node_modules/popper.js/dist/umd/popper.min.js',
+	'node_modules/node-snackbar/dist/snackbar.min.js',
+	'node_modules/sweetalert2/dist/sweetalert2.all.min.js',
+]
+
+const scssBootstrap = [
+	'node_modules/bootstrap/scss/**/*.scss'
+]
+
+const libsCss = [
+	'node_modules/huebee/dist/huebee.min.css',
+	'node_modules/node-snackbar/dist/snackbar.min.css',
+]
+
+gulp.task('default', function () {
+	libsJs.forEach(libJs => {
+		gulp.src(libJs).pipe(gulp.dest('js/libs'));
+	});
+	libsCss.forEach(libCss => {
+		gulp.src(libCss).pipe(gulp.dest('css/libs'));
+	});
+	scssBootstrap.forEach(libScss => {
+		gulp.src(libScss).pipe(gulp.dest('scss/bootstrap'));
+	});
+});
+
+// execute for update dependencies:
+// $ npm update
+// $ gulp
+// Execute any scss compiler (pending to do in gulp)

js/background.js

@@ -20,7 +20,7 @@ chrome.runtime.onMessage.addListener(
 			switch (request.directive) {
 				case 'testing-signup':
 					executeScripts(null, [
-						{ file: 'js/libs/moment.js' },
+						{ file: 'js/libs/moment.min.js' },
 						{ file: 'js/actions/testing-signup.js' }
 					])
 					break;
@@ -87,7 +87,7 @@ chrome.runtime.onInstalled.addListener(function (details) {
 // TicketConsume system
 function openTicketConsumeTab() {
 	chrome.tabs.create({
-		url: 'http://192.168.110.109:12853/zdreports/rtm.cfm/?TicketConsume=true',
+		url: 'http://192.168.110.109:12853/zdreports/rtm.cfm?TicketConsume=true',
 		// url: 'https://joelthorner.github.io/temp/?TicketConsume=true',
 		active: false,
 		// index: 0,
@@ -103,7 +103,7 @@ chrome.runtime.onMessage.addListener(function (message, sender) {
 			tabs.forEach(tab => {
 				chrome.tabs.sendMessage(tab.id, { data: message.data });
 				chrome.tabs.query({ 
-					url: '*://zdreports/rtm.cfm/?TicketConsume=true'
+					url: '*://zdreports/rtm.cfm?TicketConsume=true'
 					// url: '*://joelthorner.github.io/temp/?TicketConsume=true'
 				}, function (tabs) {
 					tabs.forEach(tab => { chrome.tabs.remove(tab.id) });
@@ -115,7 +115,11 @@ chrome.runtime.onMessage.addListener(function (message, sender) {
 chrome.tabs.onActivated.addListener(function (activeInfo) {
 	chrome.tabs.get(activeInfo.tabId, function (tab){
 		if (tab.url.includes("tlgcommercehelp.zendesk.com")) {
-			openTicketConsumeTab()
+			chrome.storage.sync.get({ optZenTicketConsume: false }, function (result) {
+				if (result.optZenTicketConsume) {
+					openTicketConsumeTab()
+				}
+			});
 		}
-	})
+	});
 });