Browse Source

Change directory structure

simov 9 years ago
parent
commit
60f7638899

+ 1 - 1
js/background/background.js → background/background.js

@@ -47,7 +47,7 @@ chrome.extension.onMessage.addListener((req, sender, sendResponse) => {
   }
   else if (req.message === 'raw') {
     chrome.storage.sync.set({raw: req.raw}, sendResponse)
-    sendMessage({message: 'raw'})
+    sendMessage({message: 'raw', raw: req.raw, theme: req.theme})
   }
 
   return true

+ 0 - 0
js/background/markdown.js → background/markdown.js


+ 10 - 15
js/content.js → content/content.js

@@ -1,16 +1,14 @@
 
-function injectCSS () {
+function injectCSS (url) {
   var link = document.createElement('link')
   link.rel = 'stylesheet'
   link.type = 'text/css'
-  link.href = '#'
+  link.href = url
   link.id = 'theme'
   document.head.appendChild(link)
 }
 
 $(function () {
-  injectCSS()
-
   $('body').addClass('markdown-body') // github
   $('pre').attr('id', 'markdown').hide()
 
@@ -22,12 +20,10 @@ $(function () {
     Prism.highlightAll()
   })
 
-  chrome.extension.sendMessage({
-    message: 'settings',
-  }, (data) => {
-    $('#theme').attr('href', chrome.extension.getURL('/themes/' + data.theme + '.css'))
-
-    $('#theme').attr('disabled', data.raw)
+  chrome.extension.sendMessage({message: 'settings'}, (data) => {
+    if (!data.raw) {
+      injectCSS(chrome.extension.getURL('/themes/' + data.theme + '.css'))
+    }
     $('#markdown')[data.raw ? 'show' : 'hide']()
     $('#html')[data.raw ? 'hide' : 'show']()
   })
@@ -52,14 +48,13 @@ chrome.extension.onMessage.addListener((req, sender, sendResponse) => {
     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)
+    injectCSS(chrome.extension.getURL('/themes/' + req.theme + '.css'))
   }
   else if (req.message === 'raw') {
-    $('#theme').attr('disabled', !($('#theme').attr('disabled') === 'disabled'))
+    req.raw
+      ? $('#theme').remove()
+      : injectCSS(chrome.extension.getURL('/themes/' + req.theme + '.css'))
     $('#markdown, #html').toggle()
   }
 })

+ 2 - 2
views/options.html → content/options.html

@@ -4,9 +4,9 @@
   <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
   <title>Markdown Viewer</title>
   <link href="/css/options.css" rel="stylesheet" type="text/css" media="all" />
-  <script src="/js/vendor/mithril.min.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/vendor/mithril.min.js" type="text/javascript" charset="utf-8"></script>
 </head>
 <body>
 </body>
-<script src="/js/options.js" type="text/javascript" charset="utf-8"></script>
+<script src="/content/options.js" type="text/javascript" charset="utf-8"></script>
 </html>

+ 2 - 1
js/options.js → content/options.js

@@ -44,7 +44,8 @@ m.mount(document.querySelector('body'), {
         state.raw = !state.raw
         chrome.extension.sendMessage({
           message: 'raw',
-          raw: state.raw
+          raw: state.raw,
+          theme: state.theme
         }, (res) => {})
         return false
       },

+ 7 - 7
manifest.json

@@ -10,14 +10,14 @@
       "38" : "/images/icon38.png"
     },
     "default_title": "Markdown Viewer",
-    "default_popup": "/views/options.html"
+    "default_popup": "/content/options.html"
   },
 
   "background" : {
     "scripts": [
-      "/js/vendor/marked.js",
-      "/js/background/markdown.js",
-      "/js/background/background.js"
+      "/vendor/marked.js",
+      "/background/markdown.js",
+      "/background/background.js"
     ],
     "persistent": false
   },
@@ -53,9 +53,9 @@
         "/css/prism.css"
       ],
       "js": [
-        "/js/vendor/jquery-2.2.0.min.js",
-        "/js/vendor/prism.js",
-        "/js/content.js"
+        "/vendor/jquery-2.2.0.min.js",
+        "/vendor/prism.js",
+        "/content/content.js"
       ],
       "run_at": "document_start",
       "all_frames": true

+ 0 - 0
js/vendor/jquery-2.2.0.min.js → vendor/jquery-2.2.0.min.js


+ 0 - 0
js/vendor/marked.js → vendor/marked.js


+ 0 - 0
js/vendor/mithril.min.js → vendor/mithril.min.js


+ 0 - 0
js/vendor/prism.js → vendor/prism.js