diff options
author | Alex Yatskov <alex@foosoft.net> | 2016-10-08 18:47:24 -0700 |
---|---|---|
committer | Alex Yatskov <alex@foosoft.net> | 2016-10-08 18:47:24 -0700 |
commit | da0cb81801ac897fa41761af0b0b18fda9d16195 (patch) | |
tree | 992bea48155ab01fee5436be84ab8605634c16c4 /ext | |
parent | 78fad1da18694d2471c0a68399d69b0fe94e2b2d (diff) |
Allow bootstrap in popup templates
Diffstat (limited to 'ext')
-rw-r--r-- | ext/bg/js/templates.js | 20 | ||||
-rw-r--r-- | ext/fg/js/driver.js | 8 | ||||
-rw-r--r-- | ext/manifest.json | 7 |
3 files changed, 22 insertions, 13 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 1f9e3c30..75bf7be5 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -5,18 +5,22 @@ templates['footer.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c return " <script src=\"" + container.escapeExpression(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"root","hash":{},"data":data}) : helper))) - + "/js/frame.js\"></script>\n </body>\n</html>\n"; + + "/fg/js/frame.js\"></script>\n </body>\n</html>\n"; },"useData":true}); templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; return "<!DOCTYPE html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\">\n <title></title>\n <style>\n @font-face {\n font-family: kanji-stroke-orders;\n src: url('" + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) - + "/ttf/kanji-stroke-orders.ttf');\n }\n @font-face {\n font-family: vl-gothic-regular;\n src: url('" + + "/fg/ttf/kanji-stroke-orders.ttf');\n }\n @font-face {\n font-family: vl-gothic-regular;\n src: url('" + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) - + "/ttf/vl-gothic-regular.ttf');\n }\n </style>\n <link rel=\"stylesheet\" href=\"" + + "/fg/ttf/vl-gothic-regular.ttf');\n }\n </style>\n <link rel=\"stylesheet\" type=\"text/css\" href=\"" + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) - + "/css/frame.css\">\n </head>\n <body>\n"; + + "/lib/bootstrap-3.3.6-dist/css/bootstrap.min.css\">\n <link rel=\"stylesheet\" type=\"text/css\" href=\"" + + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) + + "/lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css\">\n <link rel=\"stylesheet\" href=\"" + + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) + + "/fg/css/frame.css\">\n </head>\n <body>\n"; },"useData":true}); templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; @@ -33,7 +37,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia + alias1(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper))) + "\"><img src=\"" + alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0)) - + "/img/add_kanji.png\"></a>\n"; + + "/fg/img/add_kanji.png\"></a>\n"; },"4":function(container,depth0,helpers,partials,data) { var stack1; @@ -108,7 +112,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial + alias1(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper))) + "\"><img src=\"" + alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0)) - + "/img/play_audio.png\"></a>\n"; + + "/fg/img/play_audio.png\"></a>\n"; },"4":function(container,depth0,helpers,partials,data,blockParams,depths) { var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression, alias5=container.lambda; @@ -116,11 +120,11 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial + alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper))) + "\"><img src=\"" + alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0)) - + "/img/add_term_kanji.png\"></a>\n <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note disabled\" data-mode=\"term_kana\" data-index=\"" + + "/fg/img/add_term_kanji.png\"></a>\n <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note disabled\" data-mode=\"term_kana\" data-index=\"" + alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper))) + "\"><img src=\"" + alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0)) - + "/img/add_term_kana.png\"></a>\n"; + + "/fg/img/add_term_kana.png\"></a>\n"; },"6":function(container,depth0,helpers,partials,data) { var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = " <div class=\"term-expression\"><ruby>"; diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js index 1e817c1c..79a3eb9f 100644 --- a/ext/fg/js/driver.js +++ b/ext/fg/js/driver.js @@ -29,7 +29,7 @@ class Driver { this.options = null; this.definitions = null; this.sequence = 0; - this.fgRoot = chrome.extension.getURL('fg'); + this.extRoot = chrome.extension.getURL('.'); chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this)); window.addEventListener('message', this.onFrameMessage.bind(this)); @@ -139,7 +139,7 @@ class Driver { }); const sequence = ++this.sequence; - return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'term-list.html').then(content => { + return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'term-list.html').then(content => { this.definitions = definitions; this.pendingLookup = false; this.showPopup(textSource, content); @@ -167,7 +167,7 @@ class Driver { definitions.forEach(definition => definition.url = window.location.href); const sequence = ++this.sequence; - return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => { + return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'kanji-list.html').then(content => { this.definitions = definitions; this.pendingLookup = false; this.showPopup(textSource, content); @@ -278,7 +278,7 @@ class Driver { definitions.forEach(definition => definition.url = window.location.href); const sequence = ++this.sequence; - return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => { + return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'kanji-list.html').then(content => { this.definitions = definitions; this.popup.setContent(content, definitions); return canAddDefinitions(definitions, ['kanji']); diff --git a/ext/manifest.json b/ext/manifest.json index 02cfd6d8..dc766795 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -33,6 +33,11 @@ "fg/img/play_audio.png", "fg/js/frame.js", "fg/ttf/kanji-stroke-orders.ttf", - "fg/ttf/vl-gothic-regular.ttf" + "fg/ttf/vl-gothic-regular.ttf", + "lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css", + "lib/bootstrap-3.3.6-dist/css/bootstrap.min.css", + "lib/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.ttf", + "lib/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff", + "lib/bootstrap-3.3.6-dist/fonts/glyphicons-halflings-regular.woff2" ] } |