From 2abf1649ee7c9e55fa4c9246e4c11c433c162504 Mon Sep 17 00:00:00 2001 From: Peter Krautzberger Date: Thu, 19 Mar 2015 20:54:30 +0100 Subject: [PATCH] 1100: code clean up --- images/CloseX-31.png | Bin 1267 -> 0 bytes unpacked/extensions/HelpDialog.js | 23 +++++++++-------- unpacked/extensions/MathMenu.js | 41 ++++++++++++++---------------- 3 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 images/CloseX-31.png diff --git a/images/CloseX-31.png b/images/CloseX-31.png deleted file mode 100644 index 1672200e46d066d184317cdfb223b3678381955d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1267 zcmV=jYtp+tAO?%E`&Z!^60@x2&tHt*fi2rKO>tpOur7p`V|prKPN^ ztF5c6xVN{&!^6tS$=k4w7?(OaK^Yj1z|4~+OG5`Po4|GyaQve() zDmgh-aet1g#>Uj+k!OQX000CwNkljWHLQbuq@2W%0JZ%F2l7GF7=NxR!+KeJ=1}gp~RCU2<`% zB}4V;7ZY%nY@L4zO->Ed?~mRSUm`jOU;ZR#7g>>;B`dlVn>YSHst>~yX$anlu5G(N zUQ}=xXCP<{P96T3&#nYy{V*jocq^dl=WgGTtn=?bbiRO)`*ET*dWd}n{cw|5&DWHr zuSR0s4qNB8?Ub$760;NRZrY>{==tosZuSs@cmL!=7UZLxT#P9_D z7_sfJ@{oxd7;Hp8Cg#4u$|JHQ6!Bs8w}RifgZ4lryU5X-zaksaJRa#+vd>#6ElOC2 zE!Fb}U_)aigpCOF1F>|6b;Sxx(WMuE0yZQzEqEzFKdDKVr#|tm<_J6DQ=Tf;mu_Ef z9b~h@%l7Q*;!Am|=h-a1m#0dA*VyL-o1kOQ*O)dmoM$uiPbG6W_=vm87dklN=s0+% zrbIjsbXLu72cyH_R(~IXx4_M}1{1A5`dO>hc2Tx1S*?HTSP}=Gp^ZG)D7yZxJhNW#w@KgU zA>o8xd2a7B+$^IBNhfQ^O?sPa$C??wxFXg|yG92##8p3c`7g!74dGazuYQE1+r__^ z3f=9wgZWQ-j9e9E9X{ddi4WAV>V@TxUkj?$GmqsI_uI6#E$@V(hqYcqb-1(QC2t=7 zjKZ$NUeo0;P~{6eBrFG1APN9Y4=-?|xx&&}ww@?6!{M(aonqr`2!}%m-_>5z6%_cD zfx|JV(PqQ1Z(1CAI?vV~lLB|b(|NWy5>C*Oy+0i3$lf3BCU|7K!;ua2-QdXP=seu# zuz9*iI8ibT`wwMykODCX1X1)1LL=V)q*)i3ywut_wHfUCzkTca$n?+adRc7L;r(FA z&h*(TJyB0~;<1woOL1JEMKM!K{Jgb=ckE+GUJ1_lN}LxoWS zf`LKMmVnluU|tc%LC&fO+ZZMYoq5Uub=a`Nj2jE678|T}kppbN8VFgI)jt diff --git a/unpacked/extensions/HelpDialog.js b/unpacked/extensions/HelpDialog.js index e801d4475..adf7a0526 100644 --- a/unpacked/extensions/HelpDialog.js +++ b/unpacked/extensions/HelpDialog.js @@ -1,6 +1,3 @@ -/* -*- Mode: Javascript; indent-tabs-mode:nil; js-indent-level: 2 -*- */ -/* vim: set ts=2 et sw=2 tw=80: */ - /************************************************************* * * MathJax/extensions/HelpDialog.js @@ -34,7 +31,6 @@ var MENU = MathJax.Menu; var CONFIG = HUB.CombineConfig("HelpDialog",{ -// closeImg: AJAX.urlRev(OUTPUT.imageDir+"/CloseX-31.png"), // image for close "X" for mobiles styles: { "#MathJax_Help": { @@ -61,6 +57,14 @@ overflow:"auto", "text-align":"left", "font-size":"80%", padding:".4em .6em", border:"1px inset", margin:"1em 0px", "max-height":"20em", "max-width":"30em", "background-color":"#EEEEEE" + }, + + ".MathJax_Menu_Close": { + position:"absolute", + width:"21px", height:"21px", + top:".2em", right:".2em", + "font-weight": "bold", + "font-size": "1.33em" } } }); @@ -122,12 +126,11 @@ ] ]], ["a",{href:"http://www.mathjax.org/"},["www.mathjax.org"]], -// ["img", { -// src: CONFIG.closeImg, -// style: {width:"21px", height:"21px", position:"absolute", top:".2em", right:".2em"}, -// onclick: HELP.Remove -// }] - ["span",{style:{width:"21px", height:"21px", "font-weight": "bold", "font-size": "1.33em", position:"absolute", top:".2em", right:".2em"}, onclick: HELP.Remove},["\u00D7"]] + ["span",{ + className: "MathJax_Menu_Close", + onclick: HELP.Remove}, + ["\u00D7"] + ] ])); LOCALE.setCSS(help); var doc = (document.documentElement||{}); diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js index 0d38b0a40..23a53db87 100644 --- a/unpacked/extensions/MathMenu.js +++ b/unpacked/extensions/MathMenu.js @@ -48,7 +48,6 @@ var CONFIG = HUB.CombineConfig("MathMenu",{ delay: 150, // the delay for submenus -// closeImg: AJAX.urlRev(OUTPUT.imageDir+"/CloseX-31.png"), // image for close "X" for mobiles showRenderer: true, // show the "Math Renderer" menu? showMathPlayer: true, // show the "MathPlayer" menu? @@ -161,8 +160,17 @@ ".MathJax_Menu_Close": { position:"absolute", - width: "31px", height: "31px", - top:"-15px", left:"-15px" + width:"21px", height:"21px", + top:".2em", right:".2em", + "font-weight": "bold", + "font-size": "1.33em" + }, + ".MathJax_Menu_Mobile_Close": { + position:"absolute", + width:"1em", height:"1em", + top:"0", left:"0", + "font-weight": "bold", + "font-size": "1.33em" } } }); @@ -210,12 +218,10 @@ for (var i = 0, m = this.items.length; i < m; i++) {this.items[i].Create(menu)} if (MENU.isMobile) { HTML.addElement(menu,"span",{ - className: "MathJax_Menu_Close", menu: parent, + className: "MathJax_Menu_Mobile_Close", menu: parent, ontouchstart: MENU.Close, ontouchend: FALSE, onmousedown: MENU.Close, onmouseup: FALSE - },[ -// ["img",{src: CONFIG.closeImg, style:{width:"100%",height:"100%"}}] - ["span",{style:{width:"21px", height:"21px", "font-weight": "bold", "font-size": "1.33em", position:"absolute", top:".2em", right:".2em"}, onclick: MENU.About.Remove},"\u00D7"] - ]); + },"\u00D7" + ); } div.appendChild(menu); @@ -375,13 +381,6 @@ saveCookie: function () {HTML.Cookie.Set("menu",this.cookie)}, getCookie: function () {this.cookie = HTML.Cookie.Get("menu")} - - // - // Preload images so they show up with the menu - // -// getImages: function () { -// if (MENU.isMobile) {var close = new Image(); close.src = CONFIG.closeImg} -// } }); @@ -668,12 +667,11 @@ "background-color":"#E4E4E4", padding:".4em .6em", border:"1px inset" }},jax],["br"],["br"], ["a",{href:"http://www.mathjax.org/"},["www.mathjax.org"]], -// ["img", { -// src: CONFIG.closeImg, -// style: {width:"21px", height:"21px", position:"absolute", top:".2em", right:".2em"}, -// onclick: MENU.About.Remove -// }] - ["span",{style:{width:"21px", height:"21px", "font-weight": "bold", "font-size": "1.33em", position:"absolute", top:".2em", right:".2em"}, onclick: MENU.About.Remove},"\u00D7"] + ["span",{ + className: "MathJax_Menu_Close", + onclick: MENU.About.Remove}, + "\u00D7" + ] ]); MathJax.Localization.setCSS(about); var doc = (document.documentElement||{}); @@ -1195,7 +1193,6 @@ CALLBACK.Queue( HUB.Register.StartupHook("End Config",{}), // wait until config is complete -// ["getImages",MENU], ["Styles",AJAX,CONFIG.styles], ["Post",HUB.Startup.signal,"MathMenu Ready"], ["loadComplete",AJAX,"[MathJax]/extensions/MathMenu.js"]