From 412a9bbbc7084d977318c5b7d95ed204bbe27035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20NOBILI?= Date: Thu, 4 Jun 2015 20:26:58 +0200 Subject: [PATCH 1/4] Full-width select boxes in options pane --- www/css/main.css | 7 +++++++ www/scripts/app.js | 1 - www/scripts/options.js | 1 - www/scripts/thepub.js | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/www/css/main.css b/www/css/main.css index f1d842f..6ed7d5e 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -159,6 +159,13 @@ div.muchopts { background-color: rgba(255,255,255,0.1); } + .spflex > div select { + width: 100%; + font-size: large; + height: 2em; + margin-bottom: 0.5em; + } + .bcol { padding: 4pt; overflow:hidden; diff --git a/www/scripts/app.js b/www/scripts/app.js index 8e4f8af..2a8a866 100644 --- a/www/scripts/app.js +++ b/www/scripts/app.js @@ -238,7 +238,6 @@ function(uitouch, dict, frame, options, book, stuff, sound, sharedf, sharedc, re ntoc.appendChild(html); dtoc.appendChild(ntoc); var sel = document.getElementById("tocselect"); - sel.style.width = Math.min(parseInt(window.innerWidth)-24, parseInt(stuff.getStyle(sel, 'width')))+"px"; sel.addEventListener("change", function (event){ if(event.target.disabled === true) { event.target.disabled = false; diff --git a/www/scripts/options.js b/www/scripts/options.js index e474b2c..ef8efa0 100644 --- a/www/scripts/options.js +++ b/www/scripts/options.js @@ -123,7 +123,6 @@ define( nm.disabled = 1; sel.appendChild(nm); sel.id = key; - sel.style.width = "80%"; if(key==="dict_db"){ sharedc.register('dict', 'got_dbs', function(_txt){add_dbs(sel, nm, _txt);}); }else if(key==="dsfile"){ diff --git a/www/scripts/thepub.js b/www/scripts/thepub.js index c64667b..d1c3c29 100644 --- a/www/scripts/thepub.js +++ b/www/scripts/thepub.js @@ -34,7 +34,6 @@ function(jsepub, stuff, encod, options, sharedf, sharedc){ var div = document.createElement("div"); var sel = document.createElement("select"); sel.setAttribute("id", "tocselect"); - sel.style.width = "auto"; for(i=0; i Date: Thu, 4 Jun 2015 21:47:21 +0200 Subject: [PATCH 2/4] Ensure Hammer events don't get initialized multiple times --- www/scripts/app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/scripts/app.js b/www/scripts/app.js index 2a8a866..8ed0938 100644 --- a/www/scripts/app.js +++ b/www/scripts/app.js @@ -18,6 +18,7 @@ function(uitouch, dict, frame, options, book, stuff, sound, sharedf, sharedc, re var hammer = require('hammer'); console.log("Got hammer"); //NFP console.log(hammer); + var events_initialized = false; var style = mtextfrm.ownerDocument.createElement('style'); document.getElementsByTagName('head')[0].appendChild(style); var sndcnt = document.getElementById('sndcnt'); @@ -279,7 +280,9 @@ function(uitouch, dict, frame, options, book, stuff, sound, sharedf, sharedc, re mtextfrm.style.height = cheight+'px'; mtext.style.height = cheight+'px'; mtextfrm.style.display = 'block'; - eventifymtext(mtextfrm.contentWindow.document.body.parentNode); + if (!events_initialized) + eventifymtext(mtextfrm.contentWindow.document.body.parentNode); + events_initialized = true; var fs = parseInt(stuff.getStyle(mtext, 'font-size')); if(!nosave) options.setpage(book.foliant().currentpage()); if(data[1] && !percent) percent = frame.prc_from_anchor(data[1], percent); From 2b1253d411ce0ba6e7b3847d7235632f356e720e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20NOBILI?= Date: Thu, 4 Jun 2015 22:07:08 +0200 Subject: [PATCH 3/4] Text is justified --- www/css/main.css | 4 +--- www/scripts/app.js | 1 + www/scripts/frame.js | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/www/css/main.css b/www/css/main.css index 6ed7d5e..2a09f76 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -167,7 +167,7 @@ div.muchopts { } .bcol { - padding: 4pt; + padding: 2pt; overflow:hidden; font-size:0.75em; word-wrap:normal; @@ -176,7 +176,5 @@ div.muchopts { min-width: 98%; width: 98%; right: 4pt; - margin-left: 1px; - margin-right: 1px; /* text-shadow:#aaa 0px 0.3px 0, #aaa 0px -0.3px 0px, #aaa 0.3px 0px 0px, #aaa -0.3px 0px 0px;*/ } diff --git a/www/scripts/app.js b/www/scripts/app.js index 8ed0938..a7735f7 100644 --- a/www/scripts/app.js +++ b/www/scripts/app.js @@ -273,6 +273,7 @@ function(uitouch, dict, frame, options, book, stuff, sound, sharedf, sharedc, re frame.set_fontcolor(); frame.set_sizes(); frame.set_fontsize(); + frame.set_text_align('justify'); } var cheight = parseInt(stuff.getStyle(mtextfrm.contentWindow.document.body.parentNode, 'height')); cheight = Math.max(cheight, window.innerHeight); diff --git a/www/scripts/frame.js b/www/scripts/frame.js index 1754acd..0765ac7 100644 --- a/www/scripts/frame.js +++ b/www/scripts/frame.js @@ -30,6 +30,12 @@ define( mtextfrm.getElementsByTagName('head')[0] .appendChild(style); }, + set_text_align:function(align){ + style = get_style('txtalign'); + style.innerHTML = "body {\n text-align: "+align+";\n}"; + mtextfrm.getElementsByTagName('head')[0] + .appendChild(style); + }, set_fontsize:function(size){ if(!size) size = savedsize; else savedsize = size; From d137da8383bf4d5de25548ede6e438b2ea5eb2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20NOBILI?= Date: Fri, 5 Jun 2015 17:24:19 +0200 Subject: [PATCH 4/4] Revert "Ensure Hammer events don't get initialized multiple times", fixed upstream. This reverts commit a538328eaf0728f4da41e527635fbfca0e4641b2. --- www/scripts/app.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/www/scripts/app.js b/www/scripts/app.js index a7735f7..c6bc09c 100644 --- a/www/scripts/app.js +++ b/www/scripts/app.js @@ -18,7 +18,6 @@ function(uitouch, dict, frame, options, book, stuff, sound, sharedf, sharedc, re var hammer = require('hammer'); console.log("Got hammer"); //NFP console.log(hammer); - var events_initialized = false; var style = mtextfrm.ownerDocument.createElement('style'); document.getElementsByTagName('head')[0].appendChild(style); var sndcnt = document.getElementById('sndcnt'); @@ -281,9 +280,7 @@ function(uitouch, dict, frame, options, book, stuff, sound, sharedf, sharedc, re mtextfrm.style.height = cheight+'px'; mtext.style.height = cheight+'px'; mtextfrm.style.display = 'block'; - if (!events_initialized) - eventifymtext(mtextfrm.contentWindow.document.body.parentNode); - events_initialized = true; + eventifymtext(mtextfrm.contentWindow.document.body.parentNode); var fs = parseInt(stuff.getStyle(mtext, 'font-size')); if(!nosave) options.setpage(book.foliant().currentpage()); if(data[1] && !percent) percent = frame.prc_from_anchor(data[1], percent);