From 75791c6c9038e8f2142825bb2fd46af5b8e78f3f Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 28 Aug 2012 08:25:02 +0100 Subject: [PATCH] Reinstated check for the page being loaded from a file URI --- tiddlyfox/extension/content/overlay.js | 3 ++- tiddlyfox/extension/tiddlyfox.xpi | Bin 10751 -> 10776 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tiddlyfox/extension/content/overlay.js b/tiddlyfox/extension/content/overlay.js index d9d0bb4fe..7787dd142 100644 --- a/tiddlyfox/extension/content/overlay.js +++ b/tiddlyfox/extension/content/overlay.js @@ -85,7 +85,8 @@ var TiddlyFox = { isTiddlyWiki: function(doc,win) { // Test whether the document is a TiddlyWiki (we don't have access to JS objects in it) - return (doc.scripts[0].id === "versionArea"); + return (doc.location.protocol === "file:") && + (doc.scripts[0].id === "versionArea"); } }; diff --git a/tiddlyfox/extension/tiddlyfox.xpi b/tiddlyfox/extension/tiddlyfox.xpi index 1987058de65e0398047580213bf5b43d4cc8626c..0e2fccad17ec9a11d3f74c5809752c93bd388bc2 100644 GIT binary patch delta 2280 zcmZXVdpy+X7stPh85x(*s~L(k6hBoEk!Odn6_aInPH9FxQndYS3*c` zzie`AD^W_+QsY+G>c_gikWv}TQoH-GF`-se2ebI#{^z0TPNQ8*M z0p8kq7?mTrM^roXpd)wZ=qf>Y#9nQaMAq;Kh!a9@qAx+XKY?_EzLeMVFbc8-V z{I||PhoHXG?u%nlnG1ItvW;SVennk*%lfHqO1>}r%7Q)K=fi657{Yomb9ajf4ne=z zK*eF#{S<4jo<-$RHTQr1<&qC}Z2GNrEcrSdVImJZ6WLQc_2ks>-~mdkZuN&;q|t7& zrtxgoIrchkvNwWle>d;ib9~5LXF|m*j|x{giR;Z|=Ox*r{=@UaEOgVU3b^{OM_DAX zr{v0jR0FRLPq$R(;-P4%)7eb4ud--_m%RId$}-U^LJ@SGJv-iu?e7D7D(%2he0Sy% z7xwegd?ww*RArXTv_47bY7qu;4`Q1SN@mIbvF1ORTpAdb+$$3^Z3k(8WE%V4#v>ch z(VFQLP7yk_)AIV{XPPJpPZpqNEHW!B`hGaya@7m+@ zlvuE6-C`zEn_0fzogrpp)$ZqRmL9w}VMr8D-6$xpmYHXlgC?E{=P1w5VVd+G2Uj^R z#Xoh7&ezF7y=c_$uYX?_k_4l$lE@nefpi6v0$iyo0_{fB7@H5f;D{|@t){Cf!yzN) zwfP2`kM%wc(r3yoXF8dfM&!!m3-tW4+sqsPJJLlY1-`?|9(Ok%-%G#KGBWK(DSP_j zXqVoC)lDOr;NqpQ1esMA-@a?IIb?gY-NO%8r&<%%6QymE0?; zWfja$c{AZNx;)a-l47Q7z=Gme-f$+3X9KVXK3+=Gribfvy9}67M#rpeofPlKbu2b7 z{fLSRLg^Kaz4D*4a3sl8yBIpd_A2gt_g@2cW}^CCA&)>ZDg6-Iv@Su~9PcgCeP|iG zj83D}-@TL4BA3qN4{(ltPChL@Lb!Z!;=wE(W0Wa2$klaBVP?#`UyC_46Sc*Gj4h@)Yj=Yf0B+NZbx$l_Q_)A-+QAJhRwPtDN5d z^NimllIRt}{8MjDmL*f7F{1rT97CDVPuHJ%S{}DyEd|wMN@x#gF?;R(;laTJU6~DTj~paO8_RDK3HwHyF=_BcPs&n{&7D-e zu&I^W!}tpuyVanp?ZmN&2?cSjKN~+O49vRLcP%D5jUh_O$*i;_gX(+7VhH9vCNAfL za7d3Th=t0ny7_YFUUpKAAVs%oIkMooW=X)!JQ?8JfKB~bFRebUA7j-1$uD52a~lk7Uz;-J=0(cQiHKhh(xV%l_vNC`Nm2K*&%>LjHZL zdboUjBQd&g9CGrF@K3$UIl8G6Bj+pr@lJ_^ItS=o&Tz9}#T$>muH&?;Ert|+zFdwk z(j>@*qP>iF?kv0Ekz9q3bTNDJ#PS_8{yv!!*w#w=lwZwitrB-@rUEL8Y>HOS@;#&1 zZ!C!6(HR}Zxv>TQ@7CzvHl>E_Fk)iidtu*-SLYuEHw617A;$laiBa{^Av0vv1 z7>C{`K;TXES$-HAL)c`;G5h%}6Qe9(H*aBTA!@v=dE-g2pxg;T52Vm^whjfsD;26Z z!D+BxHGzNQ4Rs_Kf|cgY50IdN;1z-M7terDnLzF8Bb zsQ;N0E?;8=Rd6faC4vS3YOo)PO6Cgmo&S?MQqk(0pG?y}ar|49K$~M4NJs`60JG7G z-zQPSb!lM$kbpsMaT)N+L}29tb0GkbCJF#>U~8F07yt+*ll+6o1V#j7Yf?J@{@X7H w0YDm9Fb`1$1V8;v48Eox{dzcOxEj*9TYB4L^GDAR$AWD_`5GZ(GRSqKK>4fz zgqlFOa7f@E_*sAem0<_843YF1*n$DTG6Ddk0cDV(B}W$p1imKX7!id4Ag~V*0D#G| z)4WCWa8Nduy(E;n^K!_}w~Ufyts{Xh7lOaVr=zEgGD?rH3>8cptUPsk){ss7yk10( z#Vy@5iuZ0*E?%V7mMI8t3U7kaQ>N{6>&;TP$j!LRq7OW=dikQMJFY?jy#d049&q|l z`#Vj=KI11XS?8Wq!5-8mGIG5P7g?cM6E66?b7>2A=aTHLPxU^MyI4@yk;*bwszcy3 ztJdJk|E_y^A<}=XpGneeBKUh*Fb3Vv&JN2MRlB@TBx3a}n;}0x#n{vKD?Bcd^_445 zQ1B^AR_uj%xik~Su?vd+ ztKj@AYN?N>daspS%)}222a$yAfkvsY5>`P-LWo#=O0SA{KRjo}y~P|>bCO=Ry^Zhkd*4|76Lm%5%)`lI?gWozwq7HoE`{Pj^%_Em=p$JL^K$G9y04CV2<$?-d? zXj-C>-;2)r*!PfQY5NG|VJWyojb>(L%rsiocE0_*Xv%YdCRwd%53fr*8c~p|lYTgK z#%3w${-^Mi7%F3m1N{?MBVV6?(&t z-kLJ3vhc|rAHFhS*zVC(I4)wMEWPGnx31cE=D5lbt8rw*qGI9tll^AOHP4DXvT4iO zNk4i&I6CdQ^TzW^qEd}rLaT4@L7`l&V14br{e5<23LyuSe%Vetf9JXt9p50Fzjjt+ zuU=PXm3zO1#w=rtne@bMS;Np<_qHBkq-T73uZYyaKcmx^PCK0bBO@m=&on@1Gp-O; zQRlo|JQ%ol*@gKIFJTgiu^AX~h?!ARpO|i}pU)R9?wCg$2c@Gj#Ez=PNAF3^6FO@= zmDB2_@0b+ategBO1abYz1rPD$M6z^ancV%RKavVJ|G; zAkOUck2!e6U9IhixoW}ry2N6|uF=KGoPLtMHwetUrk^CA5gz|ah)wkLM<6>d zS0ihw&q<`E`hvTy1QLCEaJ~1{W_auYTG^a1QPBjaQKW7nw}A-^IMH->@I$2QmDGpH zy;hGBR>xAXMFv};Hq<_JO1MH7-PWv4dW3wnFZTE+ncMk=_Nx^x9n(skrmhP*Ppt(? z`e>yyN^@=xkoBX4u2H;u5%sD!$yCO)@*z#U#hW<6dPlMxn4y=RX}&f&g=|k-fmDYx zOe?c{bMA)(b&qcAf7b@X9?G>((ktn>hYATKM*nd$s%3D?epLPuOaXEDMs0qj@W|ua zU1M@)RmFbfJs*$s%+xm?dNFNiR`E9IEmS^eBq3ewdy=b1-mi^I!y)P8_r9agcpKuI z`WAbfHt>p(ll!J|VXU6>dfTmw>lT>^w|HV^dz;zRi~mj*9*B#fvZgw>%{g_OQw~Kq zbsM~m!14-k!!*L?OR?2P8t~ycq=z`S0=J>m`S3Lg3*|y7)&HscvZDNc0G?LG@Vvh^ z1Ta@skB7iP)eGG3jn!~`MpZN6vPv~Hk2MUb)d+B5JO;&sym+k`Egk~jVwhaFAPrqk z`3E6bWv+c!!;ovQXne6HHT8C_dublpW&iSxEvCg^7vJ4+z#y$}q_j|K$?Qf%4h{;Z z1cmDdM^Y|QNzu5d2&#*-Ah#=l>@?IkVMN-Cy)4B6fHP5mBBzORM>zum?$^ffQsVml zYf~v&0tx`t>_&(9>dS6vKsh5D%+QwEwY?w>l+2Eit|aig zr5>oSBgfOV;N*yHEOk4{_N1|={4U)vRlWixXrGId{sjt^8jSM^_u&h&&!3z83i<$< z?G2#WQ*l=iDR4#y%@gF_6&j0@XQ%