Merge pull request #191 from joelthorner/2.x

2.x
joelthorner · Sep 11, 2019 · de27d34 · de27d34
2 parents b4172ed + 595480b
commit de27d34
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/js/inject/zendesk/ticket-consume.js b/js/inject/zendesk/ticket-consume.js
@@ -76,32 +76,28 @@ TicketConsume = {
 		chrome.runtime.onMessage.addListener(function (message, sender) {
 			try {
 				var data = JSON.parse(message.data);
-				log('TicketConsume intranet', 'success');
-				console.log(data);
+				log('TicketConsume intranet', 'success'); console.log(data);
 				$.extend(true,TicketConsume.data, data)
 
 				$(document).off('DOMSubtreeModified').on('DOMSubtreeModified', function (event) {
 					if ($(event.target).find('[href*="organizations"]').length) {
 						$('[data-test-id="customercontext-userinfo-organization"] [href*="organizations"]').each(function (index, ticketOrg) {
 							let $ticketOrg = $(ticketOrg);
 							if (typeof $ticketOrg.data('ovserved-org') === 'undefined') {
-			
+
 								$ticketOrg.data('ovserved-org', true);
 								let findOrgId = $ticketOrg.attr('href').match(/\d{1,}/);
-
 								if (findOrgId) {
 									let orgId = findOrgId[0], orgName = $ticketOrg.text().trim().toLowerCase();
-
 									TicketConsume.observerInit(orgId, orgName, $ticketOrg);
 								}
 							}
-						})
+						});
 						TicketConsume.initIntervals();
 					}
 				});
 			} catch (error) {
-				log('TicketConsume invalid data', 'danger');
-				console.log(message.data);
+				log('TicketConsume invalid data', 'danger'); console.log(message.data);
 			}
 		});
 	},

diff --git a/js/options/changelog.js b/js/options/changelog.js
@@ -3,7 +3,8 @@ const CHANGELOG = [
 		version: 'v2.3.15', date: '10 Sep 2019',
 		lines: [
 			'FIXED Fix multiple open windows by TicketConsume (Zendesk) #188',
-			'IMPROVED Gulp automatic version replace (dev) #189'
+			'IMPROVED Gulp automatic version replace (dev) #189',
+			'FIXED Fix "method_lines" issue in js/inject/zendesk/ticket-consume.js #186'
 		]
 	}, {
 		version: 'v2.3.14', date: '04 Sep 2019',