alex/yomichan
1
Fork 0
Code Releases Activity

Revert "Allow bootstrap in popup templates"

Browse Source 
This reverts commit da0cb81801.
This commit is contained in:
Alex Yatskov 2016-10-08 19:40:19 -07:00
parent da0cb81801
commit f34b512522
7 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/bg/js/templates.js
View File

@ -5,22 +5,18 @@ templates['footer.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
return " <script src=\"" 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))) + 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)))
+ "/fg/js/frame.js\"></script>\n </body>\n</html>\n"; + "/js/frame.js\"></script>\n </body>\n</html>\n";
},"useData":true}); },"useData":true});
templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { 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; 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('" 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))) + 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/ttf/kanji-stroke-orders.ttf');\n }\n @font-face {\n font-family: vl-gothic-regular;\n src: url('" + "/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))) + 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/ttf/vl-gothic-regular.ttf');\n }\n </style>\n <link rel=\"stylesheet\" type=\"text/css\" href=\"" + "/ttf/vl-gothic-regular.ttf');\n }\n </style>\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))) + 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.min.css\">\n <link rel=\"stylesheet\" type=\"text/css\" href=\"" + "/css/frame.css\">\n </head>\n <body>\n";
+ 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}); },"useData":true});
templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) { templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1; var stack1;
@ -37,7 +33,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))) + 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=\"" + "\"><img src=\""
+ alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0)) + alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0))
+ "/fg/img/add_kanji.png\"></a>\n"; + "/img/add_kanji.png\"></a>\n";
},"4":function(container,depth0,helpers,partials,data) { },"4":function(container,depth0,helpers,partials,data) {
var stack1; var stack1;
@ -112,7 +108,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))) + 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=\"" + "\"><img src=\""
+ alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0)) + alias1(container.lambda((depths[1] != null ? depths[1].root : depths[1]), depth0))
+ "/fg/img/play_audio.png\"></a>\n"; + "/img/play_audio.png\"></a>\n";
},"4":function(container,depth0,helpers,partials,data,blockParams,depths) { },"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; var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression, alias5=container.lambda;
@ -120,11 +116,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))) + 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=\"" + "\"><img src=\""
+ alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0)) + alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0))
+ "/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=\"" + "/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))) + 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=\"" + "\"><img src=\""
+ alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0)) + alias4(alias5((depths[1] != null ? depths[1].root : depths[1]), depth0))
+ "/fg/img/add_term_kana.png\"></a>\n"; + "/img/add_term_kana.png\"></a>\n";
},"6":function(container,depth0,helpers,partials,data) { },"6":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer =
" <div class=\"term-expression\"><ruby>"; " <div class=\"term-expression\"><ruby>";

8
ext/fg/js/driver.js
View File

@ -29,7 +29,7 @@ class Driver {
this.options = null; this.options = null;
this.definitions = null; this.definitions = null;
this.sequence = 0; this.sequence = 0;
this.extRoot = chrome.extension.getURL('.'); this.fgRoot = chrome.extension.getURL('fg');
chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this)); chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this));
window.addEventListener('message', this.onFrameMessage.bind(this)); window.addEventListener('message', this.onFrameMessage.bind(this));
@ -139,7 +139,7 @@ class Driver {
}); });
const sequence = ++this.sequence; const sequence = ++this.sequence;
return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'term-list.html').then(content => { return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'term-list.html').then(content => {
this.definitions = definitions; this.definitions = definitions;
this.pendingLookup = false; this.pendingLookup = false;
this.showPopup(textSource, content); this.showPopup(textSource, content);
@ -167,7 +167,7 @@ class Driver {
definitions.forEach(definition => definition.url = window.location.href); definitions.forEach(definition => definition.url = window.location.href);
const sequence = ++this.sequence; const sequence = ++this.sequence;
return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'kanji-list.html').then(content => { return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => {
this.definitions = definitions; this.definitions = definitions;
this.pendingLookup = false; this.pendingLookup = false;
this.showPopup(textSource, content); this.showPopup(textSource, content);
@ -278,7 +278,7 @@ class Driver {
definitions.forEach(definition => definition.url = window.location.href); definitions.forEach(definition => definition.url = window.location.href);
const sequence = ++this.sequence; const sequence = ++this.sequence;
return renderText({definitions, sequence, root: this.extRoot, options: this.options}, 'kanji-list.html').then(content => { return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => {
this.definitions = definitions; this.definitions = definitions;
this.popup.setContent(content, definitions); this.popup.setContent(content, definitions);
return canAddDefinitions(definitions, ['kanji']); return canAddDefinitions(definitions, ['kanji']);

7
ext/manifest.json
View File

@ -33,11 +33,6 @@
"fg/img/play_audio.png", "fg/img/play_audio.png",
"fg/js/frame.js", "fg/js/frame.js",
"fg/ttf/kanji-stroke-orders.ttf", "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"
] ]
} }

2
tmpl/footer.html
View File

@ -1,3 +1,3 @@
<script src="{{root}}/fg/js/frame.js"></script> <script src="{{root}}/js/frame.js"></script>
</body> </body>
</html> </html>

8
tmpl/header.html
View File

@ -6,15 +6,13 @@
<style> <style>
@font-face { @font-face {
font-family: kanji-stroke-orders; font-family: kanji-stroke-orders;
src: url('{{root}}/fg/ttf/kanji-stroke-orders.ttf'); src: url('{{root}}/ttf/kanji-stroke-orders.ttf');
} }
@font-face { @font-face {
font-family: vl-gothic-regular; font-family: vl-gothic-regular;
src: url('{{root}}/fg/ttf/vl-gothic-regular.ttf'); src: url('{{root}}/ttf/vl-gothic-regular.ttf');
} }
</style> </style>
<link rel="stylesheet" type="text/css" href="{{root}}/lib/bootstrap-3.3.6-dist/css/bootstrap.min.css"> <link rel="stylesheet" href="{{root}}/css/frame.css">
<link rel="stylesheet" type="text/css" href="{{root}}/lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="{{root}}/fg/css/frame.css">
</head> </head>
<body> <body>

2
tmpl/kanji.html
View File

@ -2,7 +2,7 @@
{{#with options}} {{#with options}}
<div class="action-bar" data-sequence="{{../sequence}}"> <div class="action-bar" data-sequence="{{../sequence}}">
{{#if enableAnkiConnect}} {{#if enableAnkiConnect}}
<a href="#" title="Add Kanji" class="action-add-note disabled" data-mode="kanji" data-index="{{@index}}"><img src="{{../root}}/fg/img/add_kanji.png"></a> <a href="#" title="Add Kanji" class="action-add-note disabled" data-mode="kanji" data-index="{{@index}}"><img src="{{../root}}/img/add_kanji.png"></a>
{{/if}} {{/if}}
</div> </div>
{{/with}} {{/with}}

6
tmpl/term.html
View File

@ -2,11 +2,11 @@
{{#with options}} {{#with options}}
<div class="action-bar" data-sequence="{{../sequence}}"> <div class="action-bar" data-sequence="{{../sequence}}">
{{#if enableAudioPlayback}} {{#if enableAudioPlayback}}
<a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="{{../root}}/fg/img/play_audio.png"></a> <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="{{../root}}/img/play_audio.png"></a>
{{/if}} {{/if}}
{{#if enableAnkiConnect}} {{#if enableAnkiConnect}}
<a href="#" title="Add term as expression" class="action-add-note disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="{{../root}}/fg/img/add_term_kanji.png"></a> <a href="#" title="Add term as expression" class="action-add-note disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="{{../root}}/img/add_term_kanji.png"></a>
<a href="#" title="Add term as reading" class="action-add-note disabled" data-mode="term_kana" data-index="{{@index}}"><img src="{{../root}}/fg/img/add_term_kana.png"></a> <a href="#" title="Add term as reading" class="action-add-note disabled" data-mode="term_kana" data-index="{{@index}}"><img src="{{../root}}/img/add_term_kana.png"></a>
{{/if}} {{/if}}
</div> </div>
{{/with}} {{/with}}