simov пре 9 година
родитељ
комит
8e0372acae
3 измењених фајлова са 67 додато и 72 уклоњено
  1. 39 40
      js/background/background.js
  2. 4 4
      js/background/markdown.js
  3. 24 28
      js/content.js

+ 39 - 40
js/background/background.js

@@ -1,14 +1,18 @@
+
 // chrome.storage.sync.clear()
-chrome.storage.sync.get(function (sync) {
-  if (!sync.options)
+chrome.storage.sync.get((sync) => {
+  if (!sync.options) {
     chrome.storage.sync.set({options: md.defaults})
-  if (!sync.theme)
+  }
+  if (!sync.theme) {
     chrome.storage.sync.set({theme: 'github'})
-  if (sync.raw === undefined)
+  }
+  if (sync.raw === undefined) {
     chrome.storage.sync.set({raw: false})
+  }
 })
 
-chrome.tabs.onUpdated.addListener(function (id, info, tab) {
+chrome.tabs.onUpdated.addListener((id, info, tab) => {
   if (info.status === 'complete') return
   if (/.*\/.*\.(?:markdown|mdown|mkdn|md|mkd|mdwn|mdtxt|mdtext|text)(?:#.*)?$/
     .test(tab.url)) {
@@ -16,46 +20,41 @@ chrome.tabs.onUpdated.addListener(function (id, info, tab) {
   }
 })
 
-chrome.extension.onMessage.addListener(function (req, sender, sendResponse) {
-  switch (req.message) {
-    case 'markdown':
-      md.compile(req.markdown, sendResponse)
-      break
-
-    case 'settings':
-      chrome.storage.sync.get(['options', 'theme', 'raw'], function (data) {
-        delete data.options.langPrefix
-        sendResponse(data)
-      })
-      break
-
-    case 'options':
-      req.options.langPrefix = 'language-'//prism
-      chrome.storage.sync.set({options: req.options}, sendResponse)
-      sendMessage({message: 'reload'})
-      break
-    case 'defaults':
-      chrome.storage.sync.set({options: md.defaults}, sendResponse)
-      chrome.storage.sync.set({theme: 'github'})
-      chrome.storage.sync.set({raw: false})
-      sendMessage({message: 'reload'})
-      break
-
-    case 'theme':
-      chrome.storage.sync.set({theme: req.theme}, sendResponse)
-      sendMessage({message: 'theme', theme: req.theme})
-      break
-
-    case 'raw':
-      chrome.storage.sync.set({raw: req.raw}, sendResponse)
-      sendMessage({message: 'raw'})
-      break
+chrome.extension.onMessage.addListener((req, sender, sendResponse) => {
+  if (req.message === 'markdown') {
+    md.compile(req.markdown, sendResponse)
   }
+  else if (req.message === 'settings') {
+    chrome.storage.sync.get(['options', 'theme', 'raw'], (data) => {
+      delete data.options.langPrefix
+      sendResponse(data)
+    })
+  }
+  else if (req.message === 'options') {
+    req.options.langPrefix = 'language-' // prism
+    chrome.storage.sync.set({options: req.options}, sendResponse)
+    sendMessage({message: 'reload'})
+  }
+  else if (req.message === 'defaults') {
+    chrome.storage.sync.set({options: md.defaults}, sendResponse)
+    chrome.storage.sync.set({theme: 'github'})
+    chrome.storage.sync.set({raw: false})
+    sendMessage({message: 'reload'})
+  }
+  else if (req.message === 'theme') {
+    chrome.storage.sync.set({theme: req.theme}, sendResponse)
+    sendMessage({message: 'theme', theme: req.theme})
+  }
+  else if (req.message === 'raw') {
+    chrome.storage.sync.set({raw: req.raw}, sendResponse)
+    sendMessage({message: 'raw'})
+  }
+
   return true
 })
 
 function sendMessage (obj) {
-  chrome.tabs.query({active: true, currentWindow: true}, function (tabs) {
+  chrome.tabs.query({active: true, currentWindow: true}, (tabs) => {
     chrome.tabs.sendMessage(tabs[0].id, obj)
   })
 }

+ 4 - 4
js/background/markdown.js

@@ -1,5 +1,5 @@
 
-var md = (function () {
+var md = (() => {
   // marked
   var defaults = {
     gfm: true,
@@ -20,10 +20,10 @@ var md = (function () {
   }
 
   function compile (markdown, sendResponse) {
-    chrome.storage.sync.get(function (sync) {
+    chrome.storage.sync.get((sync) => {
       marked.setOptions(sync.options)
 
-      marked(markdown, function (err, html) {
+      marked(markdown, (err, html) => {
         if (err) throw err
         sendResponse({message: 'marked', marked: html})
       })
@@ -34,4 +34,4 @@ var md = (function () {
     defaults: defaults,
     compile: compile
   }
-}())
+})()

+ 24 - 28
js/content.js

@@ -11,33 +11,33 @@ function injectCSS () {
 $(function () {
   injectCSS()
 
-  $('body').addClass('markdown-body')//github
+  $('body').addClass('markdown-body') // github
   $('pre').attr('id', 'markdown').hide()
 
   chrome.extension.sendMessage({
     message: 'markdown',
     markdown: $('#markdown').text()
-  }, function (res) {
+  }, (res) => {
     $('body').append('<div id="html">').find('#html').append(res.marked)
     Prism.highlightAll()
   })
 
   chrome.extension.sendMessage({
     message: 'settings',
-  }, function (data) {
-    $('#theme').attr('href', chrome.extension.getURL('/themes/'+data.theme+'.css'))
+  }, (data) => {
+    $('#theme').attr('href', chrome.extension.getURL('/themes/' + data.theme + '.css'))
 
     $('#theme').attr('disabled', data.raw)
-    $('#markdown')[data.raw?'show':'hide']()
-    $('#html')[data.raw?'hide':'show']()
+    $('#markdown')[data.raw ? 'show' : 'hide']()
+    $('#html')[data.raw ? 'hide' : 'show']()
   })
 
-  $(window).on('load', function (e) {
-    setTimeout(function () {
+  $(window).on('load', () => {
+    setTimeout(() => {
       var timeout = null
-      $(window).on('scroll', function (e) {
+      $(window).on('scroll', () => {
         clearTimeout(timeout)
-        timeout = setTimeout(function () {
+        timeout = setTimeout(() => {
           localStorage.setItem('scrolltop', $(window).scrollTop())
         }, 100)
       })
@@ -47,23 +47,19 @@ $(function () {
   })
 })
 
-chrome.extension.onMessage.addListener(function (req, sender, sendResponse) {
-  switch (req.message) {
-    case 'reload':
-      window.location.reload(true)
-      break
-
-    case 'theme':
-      var raw = $('#theme').attr('disabled') == 'disabled'
-      $('#theme').remove()
-      injectCSS()
-      $('#theme').attr('href', chrome.extension.getURL('/themes/'+req.theme+'.css'))
-      $('#theme').attr('disabled', raw)
-      break
-
-    case 'raw':
-      $('#theme').attr('disabled', !($('#theme').attr('disabled') == 'disabled'))
-      $('#markdown, #html').toggle()
-      break
+chrome.extension.onMessage.addListener((req, sender, sendResponse) => {
+  if (req.message === 'reload') {
+    window.location.reload(true)
+  }
+  else if (req.message === 'theme') {
+    var raw = $('#theme').attr('disabled') === 'disabled'
+    $('#theme').remove()
+    injectCSS()
+    $('#theme').attr('href', chrome.extension.getURL('/themes/' + req.theme + '.css'))
+    $('#theme').attr('disabled', raw)
+  }
+  else if (req.message === 'raw') {
+    $('#theme').attr('disabled', !($('#theme').attr('disabled') === 'disabled'))
+    $('#markdown, #html').toggle()
   }
 })