From 514bf754e422d9e4e8394ed3720b6c4f1817090c Mon Sep 17 00:00:00 2001 From: Ben Leggiero Date: Sat, 22 Jun 2019 22:48:10 -0600 Subject: [PATCH] Added scrim to sidebar * Also shuffled around some constants --- .../general/js/BHStudios General Scripts.js | 154 ++++++++++-------- .../js/BHStudios General Scripts.meta.js | 2 +- .../jQueryInterface/jQueryInterface.kjsm | Bin 3293 -> 3832 bytes .../general/components/button/button.kjsm | Bin 1284 -> 1220 bytes .../general/components/components.kjsm | Bin 541 -> 541 bytes .../general/components/sidebar/sidebar.kjsm | Bin 1849 -> 2079 bytes .../org/bh/scripts/general/general.kjsm | Bin 478 -> 478 bytes .../scripts/general/utilities/utilities.kjsm | Bin 294 -> 294 bytes .../kt/src/jQueryInterface/jQuery Headers.kt | 32 +++- .../kt/src/org/bh/scripts/general/Main.kt | 2 +- .../components/sidebar/SidebarController.kt | 46 +++--- .../components/sidebar/SidebarModel.kt | 8 +- .../components/sidebar/SidebarViewWrapper.kt | 47 +++++- 13 files changed, 183 insertions(+), 108 deletions(-) diff --git a/assets/v2/general/js/BHStudios General Scripts.js b/assets/v2/general/js/BHStudios General Scripts.js index b2294a4..55bde74 100644 --- a/assets/v2/general/js/BHStudios General Scripts.js +++ b/assets/v2/general/js/BHStudios General Scripts.js @@ -7,14 +7,18 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { var Unit = Kotlin.kotlin.Unit; var lazy = Kotlin.kotlin.lazy_klfg04$; var toString = Kotlin.toString; - var PropertyMetadata = Kotlin.PropertyMetadata; var addAll = Kotlin.kotlin.collections.addAll_ye1y7v$; var Kind_OBJECT = Kotlin.Kind.OBJECT; + var ArrayList_init = Kotlin.kotlin.collections.ArrayList_init_287e2$; var Kind_INTERFACE = Kotlin.Kind.INTERFACE; var addClass = Kotlin.kotlin.dom.addClass_hhb33f$; var removeClass = Kotlin.kotlin.dom.removeClass_hhb33f$; var hasClass = Kotlin.kotlin.dom.hasClass_46n0ku$; + var PropertyMetadata = Kotlin.PropertyMetadata; var Kind_CLASS = Kotlin.Kind.CLASS; + var LinkedHashSet_init = Kotlin.kotlin.collections.LinkedHashSet_init_287e2$; + var ObservableProperty = Kotlin.kotlin.properties.ObservableProperty; + var LinkedHashMap_init = Kotlin.kotlin.collections.LinkedHashMap_init_q3lmfv$; var get_parentElement = defineInlineFunction('BHStudios General Scripts.jQueryInterface.get_parentElement_s15u7w$', function ($receiver) { return $receiver.parentElement; }); @@ -25,7 +29,6 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { function main(args) { $(main$lambda); } - var ArrayList_init = Kotlin.kotlin.collections.ArrayList_init_ww73n8$; function Setup() { Setup_instance = this; this.sidebarButtonControllers_0 = ArrayList_init(); @@ -85,8 +88,6 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { function hasClass_0($receiver, possibleClass) { return hasClass($receiver.htmlElement, possibleClass); } - var LinkedHashSet_init = Kotlin.kotlin.collections.LinkedHashSet_init_287e2$; - var ObservableProperty = Kotlin.kotlin.properties.ObservableProperty; Delegates$observable$ObjectLiteral.prototype = Object.create(ObservableProperty.prototype); Delegates$observable$ObjectLiteral.prototype.constructor = Delegates$observable$ObjectLiteral; function Delegates$observable$ObjectLiteral(closure$onChange, initialValue_0) { @@ -97,22 +98,12 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { this.closure$onChange(property, oldValue, newValue); }; Delegates$observable$ObjectLiteral.$metadata$ = {kind: Kind_CLASS, interfaces: [ObservableProperty]}; - Delegates$observable$ObjectLiteral_0.prototype = Object.create(ObservableProperty.prototype); - Delegates$observable$ObjectLiteral_0.prototype.constructor = Delegates$observable$ObjectLiteral_0; - function Delegates$observable$ObjectLiteral_0(closure$onChange, initialValue_0) { - this.closure$onChange = closure$onChange; - ObservableProperty.call(this, initialValue_0); - } - Delegates$observable$ObjectLiteral_0.prototype.afterChange_jxtfl0$ = function (property, oldValue, newValue) { - this.closure$onChange(property, oldValue, newValue); - }; - Delegates$observable$ObjectLiteral_0.$metadata$ = {kind: Kind_CLASS, interfaces: [ObservableProperty]}; function ButtonController(initalModel, initialView) { ButtonController$Companion_getInstance(); this.suppressChangeReactions_0 = false; this.pressListeners_0 = LinkedHashSet_init(); this.model_v5gd25$_0 = new Delegates$observable$ObjectLiteral(ButtonController$model$lambda(this), initalModel); - this.view_jr1yrn$_0 = new Delegates$observable$ObjectLiteral_0(ButtonController$view$lambda(this), initialView); + this.view_jr1yrn$_0 = new Delegates$observable$ObjectLiteral(ButtonController$view$lambda(this), initialView); this.didSetModel_0(initalModel); this.didSetView_0(initialView); } @@ -293,31 +284,21 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { simpleName: 'SidebarButtonController', interfaces: [ButtonModelDelegate] }; - Delegates$observable$ObjectLiteral_1.prototype = Object.create(ObservableProperty.prototype); - Delegates$observable$ObjectLiteral_1.prototype.constructor = Delegates$observable$ObjectLiteral_1; - function Delegates$observable$ObjectLiteral_1(closure$onChange, initialValue_0) { - this.closure$onChange = closure$onChange; - ObservableProperty.call(this, initialValue_0); - } - Delegates$observable$ObjectLiteral_1.prototype.afterChange_jxtfl0$ = function (property, oldValue, newValue) { - this.closure$onChange(property, oldValue, newValue); - }; - Delegates$observable$ObjectLiteral_1.$metadata$ = {kind: Kind_CLASS, interfaces: [ObservableProperty]}; - Delegates$observable$ObjectLiteral_2.prototype = Object.create(ObservableProperty.prototype); - Delegates$observable$ObjectLiteral_2.prototype.constructor = Delegates$observable$ObjectLiteral_2; - function Delegates$observable$ObjectLiteral_2(closure$onChange, initialValue_0) { + Delegates$observable$ObjectLiteral_0.prototype = Object.create(ObservableProperty.prototype); + Delegates$observable$ObjectLiteral_0.prototype.constructor = Delegates$observable$ObjectLiteral_0; + function Delegates$observable$ObjectLiteral_0(closure$onChange, initialValue_0) { this.closure$onChange = closure$onChange; ObservableProperty.call(this, initialValue_0); } - Delegates$observable$ObjectLiteral_2.prototype.afterChange_jxtfl0$ = function (property, oldValue, newValue) { + Delegates$observable$ObjectLiteral_0.prototype.afterChange_jxtfl0$ = function (property, oldValue, newValue) { this.closure$onChange(property, oldValue, newValue); }; - Delegates$observable$ObjectLiteral_2.$metadata$ = {kind: Kind_CLASS, interfaces: [ObservableProperty]}; + Delegates$observable$ObjectLiteral_0.$metadata$ = {kind: Kind_CLASS, interfaces: [ObservableProperty]}; function SidebarController(initialModel, initialView) { SidebarController$Companion_getInstance(); this.suppressChangeReactions_0 = false; - this.model_htwi0p$_0 = new Delegates$observable$ObjectLiteral_1(SidebarController$model$lambda(this), initialModel); - this.view_7bbqjl$_0 = new Delegates$observable$ObjectLiteral_2(SidebarController$view$lambda(this), initialView); + this.model_htwi0p$_0 = new Delegates$observable$ObjectLiteral_0(SidebarController$model$lambda(this), initialModel); + this.view_7bbqjl$_0 = new Delegates$observable$ObjectLiteral_0(SidebarController$view$lambda(this), initialView); this.didSetModel_0(initialModel); this.didSetView_0(initialView); } @@ -342,6 +323,12 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { SidebarController.prototype.didSetModel_0 = function (newModel) { newModel.delegate = this; }; + function SidebarController$didSetView$lambda(this$SidebarController) { + return function (it) { + this$SidebarController.toggleHidden(); + return Unit; + }; + } SidebarController.prototype.didSetView_0 = function (newView) { this.suppressChangeReactions_0 = true; if (newView == null) { @@ -349,26 +336,10 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { } else { loadFromView_0(this.model, newView); + newView.scrimHtmlElement.click(SidebarController$didSetView$lambda(this)); } this.suppressChangeReactions_0 = false; }; - SidebarController.prototype.didShowOrHide_dqye30$ = function (oldIsShown, newIsShown) { - if (this.suppressChangeReactions_0) { - return; - } - var view = this.view; - if (view == null) { - if (newIsShown) { - SidebarViewWrapper$Companion_getInstance().defaultElementResponsibleForHidingAndShowingTheSidebar.addClass(SidebarModel$Companion_getInstance().sidebarShownClassName); - } - else { - SidebarViewWrapper$Companion_getInstance().defaultElementResponsibleForHidingAndShowingTheSidebar.removeClass(SidebarModel$Companion_getInstance().sidebarShownClassName); - } - } - else { - view.isShown = newIsShown; - } - }; SidebarController.prototype.toggleHidden = function () { this.model.isShown = !this.model.isShown; }; @@ -399,6 +370,23 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { } return SidebarController$Companion_instance; } + SidebarController.prototype.didShowOrHide_dqye30$ = function (oldIsShown, newIsShown) { + if (this.suppressChangeReactions_0) { + return; + } + var view = this.view; + if (view == null) { + if (newIsShown) { + SidebarViewWrapper$Companion_getInstance().defaultParentElement.addClass(SidebarViewWrapper$Companion_getInstance().sidebarShownClassName); + } + else { + SidebarViewWrapper$Companion_getInstance().defaultParentElement.removeClass(SidebarViewWrapper$Companion_getInstance().sidebarShownClassName); + } + } + else { + view.isShown = newIsShown; + } + }; function SidebarController$model$lambda(this$SidebarController) { return function (f, f_0, newModel) { this$SidebarController.didSetModel_0(newModel); @@ -419,21 +407,21 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { function loadFromView_0($receiver, view) { $receiver.isShown = view.isShown; } - Delegates$observable$ObjectLiteral_3.prototype = Object.create(ObservableProperty.prototype); - Delegates$observable$ObjectLiteral_3.prototype.constructor = Delegates$observable$ObjectLiteral_3; - function Delegates$observable$ObjectLiteral_3(closure$onChange, initialValue_0) { + Delegates$observable$ObjectLiteral_1.prototype = Object.create(ObservableProperty.prototype); + Delegates$observable$ObjectLiteral_1.prototype.constructor = Delegates$observable$ObjectLiteral_1; + function Delegates$observable$ObjectLiteral_1(closure$onChange, initialValue_0) { this.closure$onChange = closure$onChange; ObservableProperty.call(this, initialValue_0); } - Delegates$observable$ObjectLiteral_3.prototype.afterChange_jxtfl0$ = function (property, oldValue, newValue) { + Delegates$observable$ObjectLiteral_1.prototype.afterChange_jxtfl0$ = function (property, oldValue, newValue) { this.closure$onChange(property, oldValue, newValue); }; - Delegates$observable$ObjectLiteral_3.$metadata$ = {kind: Kind_CLASS, interfaces: [ObservableProperty]}; + Delegates$observable$ObjectLiteral_1.$metadata$ = {kind: Kind_CLASS, interfaces: [ObservableProperty]}; function SidebarModel(initIsShown) { SidebarModel$Companion_getInstance(); if (initIsShown === void 0) initIsShown = false; - this.isShown_uoqu9g$_0 = new Delegates$observable$ObjectLiteral_3(SidebarModel$isShown$lambda(this), initIsShown); + this.isShown_uoqu9g$_0 = new Delegates$observable$ObjectLiteral_1(SidebarModel$isShown$lambda(this), initIsShown); this.delegate = null; } var SidebarModel$isShown_metadata = new PropertyMetadata('isShown'); @@ -445,15 +433,15 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { this.isShown_uoqu9g$_0.setValue_9rddgb$(this, SidebarModel$isShown_metadata, isShown); } }); - var LinkedHashMap_init = Kotlin.kotlin.collections.LinkedHashMap_init_q3lmfv$; function SidebarModel$Companion() { SidebarModel$Companion_instance = this; - this.className = 'sidebar'; - this.sidebarShownClassName = 'sidebar-shown'; this.existingModels_0 = LinkedHashMap_init(); } + SidebarModel$Companion.prototype.invoke_i737le$ = function (viewWrapper) { + return this.invoke_ivxn3r$(viewWrapper.htmlElement.id, viewWrapper.isShown); + }; SidebarModel$Companion.prototype.invoke_2rdptt$ = function (htmlElement) { - return this.invoke_ivxn3r$(htmlElement.id, SidebarViewWrapper$Companion_getInstance().defaultElementResponsibleForHidingAndShowingTheSidebar.hasClass(this.sidebarShownClassName)); + return this.invoke_i737le$(new SidebarViewWrapper(htmlElement)); }; function SidebarModel$Companion$invoke$lambda(closure$isShown) { return function () { @@ -498,35 +486,59 @@ this['BHStudios General Scripts'] = function (_, Kotlin) { simpleName: 'SidebarModelDelegate', interfaces: [] }; - function SidebarViewWrapper(htmlElement) { + function SidebarViewWrapper(htmlElement, parentElement) { SidebarViewWrapper$Companion_getInstance(); + if (parentElement === void 0) + parentElement = SidebarViewWrapper$Companion_getInstance().defaultParentElement; this.htmlElement_quxvwl$_0 = htmlElement; + this.parentElement_0 = parentElement; + this.scrimHtmlElementGetter_0 = SidebarViewWrapper$Companion_getInstance().scrimElementGetter_r6ezyp$(this.parentElement_0); + if (0 === this.scrimHtmlElementGetter_0().length) { + this.parentElement_0.prepend(SidebarViewWrapper$Companion_getInstance().generateNewScrimHtmlString()); + } } Object.defineProperty(SidebarViewWrapper.prototype, 'htmlElement', { get: function () { return this.htmlElement_quxvwl$_0; } }); - Object.defineProperty(SidebarViewWrapper.prototype, 'isShown', { + Object.defineProperty(SidebarViewWrapper.prototype, 'scrimHtmlElement', { get: function () { - return this.elementResponsibleForHidingAndShowingTheSidebar.hasClass(SidebarModel$Companion_getInstance().sidebarShownClassName); - }, - set: function (newValue) { - if (newValue) - this.elementResponsibleForHidingAndShowingTheSidebar.addClass(SidebarModel$Companion_getInstance().sidebarShownClassName); - else - this.elementResponsibleForHidingAndShowingTheSidebar.removeClass(SidebarModel$Companion_getInstance().sidebarShownClassName); + return this.scrimHtmlElementGetter_0(); } }); - Object.defineProperty(SidebarViewWrapper.prototype, 'elementResponsibleForHidingAndShowingTheSidebar', { + Object.defineProperty(SidebarViewWrapper.prototype, 'isShown', { get: function () { - return SidebarViewWrapper$Companion_getInstance().defaultElementResponsibleForHidingAndShowingTheSidebar; + return this.parentElement_0.hasClass(SidebarViewWrapper$Companion_getInstance().sidebarShownClassName); + }, + set: function (newValue) { + newValue ? this.show_0() : this.hide_0(); } }); + SidebarViewWrapper.prototype.hide_0 = function () { + this.parentElement_0.removeClass(SidebarViewWrapper$Companion_getInstance().sidebarShownClassName); + }; + SidebarViewWrapper.prototype.show_0 = function () { + this.parentElement_0.addClass(SidebarViewWrapper$Companion_getInstance().sidebarShownClassName); + }; function SidebarViewWrapper$Companion() { SidebarViewWrapper$Companion_instance = this; - this.defaultElementResponsibleForHidingAndShowingTheSidebar = $(':root'); + this.className = 'sidebar'; + this.sidebarShownClassName = 'sidebar-shown'; + this.scrimElementClassName = 'sidebar-scrim'; + this.defaultParentElement = $(':root'); } + function SidebarViewWrapper$Companion$scrimElementGetter$lambda(closure$parentElement) { + return function () { + return $('.sidebar-scrim', closure$parentElement); + }; + } + SidebarViewWrapper$Companion.prototype.scrimElementGetter_r6ezyp$ = function (parentElement) { + return SidebarViewWrapper$Companion$scrimElementGetter$lambda(parentElement); + }; + SidebarViewWrapper$Companion.prototype.generateNewScrimHtmlString = function () { + return '
<\/div>'; + }; SidebarViewWrapper$Companion.$metadata$ = { kind: Kind_OBJECT, simpleName: 'Companion', diff --git a/assets/v2/general/js/BHStudios General Scripts.meta.js b/assets/v2/general/js/BHStudios General Scripts.meta.js index 597967f..b6be3d7 100644 --- a/assets/v2/general/js/BHStudios General Scripts.meta.js +++ b/assets/v2/general/js/BHStudios General Scripts.meta.js @@ -1 +1 @@ -// Kotlin.kotlin_module_metadata(66049, "BHStudios General Scripts", "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"); +// Kotlin.kotlin_module_metadata(393729, "BHStudios General Scripts", "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"); diff --git a/assets/v2/general/js/BHStudios General Scripts/jQueryInterface/jQueryInterface.kjsm b/assets/v2/general/js/BHStudios General Scripts/jQueryInterface/jQueryInterface.kjsm index 300947777823768801cb7e65041c232a1420b402..e16f981ddc516edf411b5bceed7192bd75eaa42d 100644 GIT binary patch literal 3832 zcmbtW+jbk(8J1>7TjO7{ye%h2nQ$-)1Td5i6WXRBq&e6@8AveTaB68YmbN81qZu(8 z*)b0gE?J8UR_}NXo}h2i7vKr__Cd0vNLh>aLi6wceBN7yLcuN+3Pt=Z{Mf3ua`4Gm zWXE@sTx9!EThM>Y^c0PSN{HCQG>`iU**B77VzEfNd5>)9k{fk8x8i6tqT)U+-5w|H zyq_ikvCs0XpLA)dEt&VCfuK^f4_{Pnr|=2Y(v2*Oj>%55F4;$y+GKaq0hPC7F_3H) z4TmD>kUh#Xa-tkxSAMmv!zdmLD&I`gSVRf2t#rH>3u1d>Kg|H!y(sBI0H71Y>ol}? zh>1hkA5m#rLUQgW{hX=_X&LEKJMOn1(#qX*JQBC$*~oUHJfccFjbot_9g%%E8j}4` z9MdvBpUbdzqJB0ax3d>(Gpr->sNEw+$gkT+6{0-NXn7~fP#B;pCnr%=>L(rXh|0p0 zp{84KXQEURgJF)Ubp?vwi$=QmtS9>29*TBvJlI3JrCxdnP&Mh_Nj@Iuv^2$t%u$k^ zUOtGaI3g!bBh-6HR+^B36Uy~u8bxR;FZcsVmu@#5sz~8 zcYmL(6yieGTc(QQjF4Yj7NNLHY#3#-6XjthRLdP44hi3MNLBe2S$?eho{6Y~5zK^g zRnbt_fHblrwV1X~OUmb#?3y#`e}~{kala$(Be+}!SI$#Cg=LIuw=46TMoA@gBpb6v zZX%9UbE$OH?_l~%N4-9}SsF%N@udb|QN2If68q6O&UcUjauOX{*4a(Qy0R_lyHO?^ zXdQfu--uYKSETp~x$P*9_aaQ+bYy+haPPn@4uZBsOzXNSNcIrc1Ar;ss)EffpMEoGqL!ZsROr$w1e@B?FfMEnXwXb@>XuOPoWV_^RPQ zXJEs?=K&q?Ux3sKf6-81Qn0``3~VYXi@yS?GyGK}^_JoK2LF@6uN!z%!4)n59mL#) z_Vc`_s1|={;LyNt8wKx&l6Ri(dzN2peZTReTXkQkyY3(ANapqaFK)qmLo?{^K3UiRMb^pSfy>vGM0Fu&c_ByoJ7=s-YN+wq8qQL6Mzd6%(P@jb9xCXw zr#v?JdGvW^(+;c$^^ozGr9|jy7}OzIQ&X^}zN>yMtn&+orsu=<&!ScrrnR~V3$j)h zOm+&N*2;!$&8hR(p0eZd*Ok^hzl^`3V%y@IfUCh({-$?%@d_>8ePsF^GJQu`TjPO> zyn?R24T{rxY@s!maIAu)$DQ$afj3aVKT9Pn%3l@~@XA!;@_Y&C{&hYFAzguW1}_pm zdmXg|1Rhicqb@GbrU;3|620%U=UCs)5%Ctjz|MR;3Fs|>?AIs|Pss;w~a zFx=}ZUh~MbLKA%n-ak~{Yy2Y#VQF&hXngkCnWgF_ou%p}J#A4g>1n(I&v%t)&hJfE z>SLKXR_dOKMd8zxlGo3Cj=X;6bL5omC~MEU3_ekj)cB{y@8t6T>~tK6cvs0?)G&}W zzHefm*CWP1hr9#5FO*)5e`)MV$igcB%3SHXUSAvT-xasUC-^^r^U&qrC|?ZE%{NN2 z%Kr&{%e8TNmvJ>|stc;T&X=E}Fhue%Xf{4&+yQj(Z=|^{AILR4klxJ#=np3Ji|$Xn a;epQaa5CNoy$XH=xD2=_A@uQ3Q{gvX1Z|iA literal 3293 zcmbVN*>=-L7?!n+Cx0AgqAVBzB{ejKK&cS4r4$NetK+f+NGNoTVvlVlvgArKA$Ig+TY&F85u><4x z;(p2(#aZb#{mh5aMjVD*R+NHq&+mb;!}nkeKTkxuYkrWVK$}}(?uImZ<~KTEa`B}B zw${($1jg3<1UrDFtksM}JFFmT@)uBC4tZCkSLEtY&YQlvZ*B2zFWUp7&9U7bKh4`s zIy`81upjsP-7Rc`)rp@YlvG<*qX+#AMg|msItsSg$+{sFQZU2V$ANUQGV4x~_ZTIVH}*hQsvN%5~JyrKBF6yA|I#u`fAL=;{-==Br}6gRAB&hMsk zg0&spE!1AkzNRJmo=xezZBlw}`wyx)=X0S~Vml7CO`$+2#b#PI9z#pxaWiLF?t-XRGnj6LO8FxC$9aeKYeAsri`AnOO#`8N_Ekj z7WQU-j-9G9o7iTh;FeWyM!Z9u`6YI#3QEt|Jnmh!C+!Iry_V?IpxYNDbNau`kM^xx zYre;BIVSGp&8qhf_BgTHP1o}Nhs|$PtG*hgFIlDF>8`P$)n^$IbMPvx=uF9iP5H$Z z;9?Nhs+W}pVSt(h=}~DxSV_{1jX9!S2F|oBIThpxpNjS<8kq(sECmA6TO zZ_orQn3D1eo5l*>7~QtM$?Al?CoP>EJsUOi;ZE$2xNfsq#mg%<+{rpa-hO3g&;!9N zXJstHBt59is5?qxv$Kc%IP3#yH7qV+b27Ij_95c9cY~dCuD!!Do_(uL>hvflrQT;PrvVr^7YS_OsyV=FTvrxH4R)Pq?DI;u2$gmsB5-+k9#BrR(SBS);_>$)j<3ZHH`%_=ZwPl5?Lu>%8 z<*L?JJqMS2M&?`2FGForWp82hy2|2fiHzMHEciW<2QK(sA;B1u9xS-Hy2B;n>JFEP znctV*-gY$~$V|#?O~u`RWFG!I56t|L)SJuE6BR#Jxex0YVe6=GqTPnHE3+rcpFmPC zv2WCW-?Ur7oAFdhpGoNf{VmevI%VIgZwf+(1iKOFQWV>M2fg65ba;n MDX{G~|HgX%03O^jWdHyG diff --git a/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/components/button/button.kjsm b/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/components/button/button.kjsm index 38d2498dee868480a57b34d04239992a3b183aa6..68c71121588fcc3b8d23bcefa9f6c3ab1ac4fbfb 100644 GIT binary patch delta 706 zcmZut!EVz)5M8gG^?H-6C)+sLnx+YES|Ai;nG5QnLP1nfjyYMJK&42fP0~Xpj+QEv zBT^a(@e^E8K7cRa%7^sI>|&58$eMk#Z^m!-%?I%<078h1;b2e7e4v2fqar^0`6elk6oT`r4@wLMU?bQM8I$u{W z>EnWduZf_*1>+n7%soz^hNpl!a#fJXF%)>P&g9JK>RGy+~)1FbPvRn7hypr_z z!qt98(_lzB9XCLr07IcFVr{gb$#+Myp6RF`IQ|e6g95N7F;QmNcpL5_Mp+AzSp7Zm z9evdr1MJv3gFa$&WSHHO*+Y~gip;%|xsMo*=%fXaso_hS2A>{1JIWUy>7)y-BG#&@ z{xd3VxowS}WJv**~7nV7{opbrm{O7Cn)<#X!QnVN?9&?J@{G&eIZA`xm zOylL?{Oq(ptFuij_2%YNJN0bPn?>xCW!)e2h9~{g!F0L;X7jAu>-NuQ-HbNtJF@ZU;n899!SSQLXz!r;xEak{US^+Xw|RY>MpJ6G0co@nW{4bfwhlHT zRWg`Y6&nRn2Mre~I#{5X!yztvP5lAEoaIUGN~Uq6ikkzxE#>?SEs^C|5!rn0HyFfx6hT{s)_ z&i=jq&g31B*3t2#D2V@@6lBMp3q7)Mi6#o23x`CM+eF0rB|`4~GE7pkNVePt2j0$O zm4*!Jyh<#!CfwhVpnSWrZ>{ZMjVgjVl#M8Z*F0Ua!0b$%IWYeg367=wtyoox5H17z zsd)(qOCk%~0wCMg0k(GHV^-n0G~=m%9;zD4R-_ezdeu_kHR5Mi7bKU8o%i}2_$3&& IMjz9D03keS^#A|> diff --git a/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/components/components.kjsm b/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/components/components.kjsm index 949da7e0308152eb3085426be04b6fa4832e980e..3defacbf69164e6c1306187cabdb43ba0437576e 100644 GIT binary patch delta 25 ccmbQsGM7bwfq{V;h#7&H35eM?3h*)k03#6sF8}}l delta 25 bcmbQsGM7bwfq{V;h#7&H2}Exc;AH{;BKQI- diff --git a/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/components/sidebar/sidebar.kjsm b/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/components/sidebar/sidebar.kjsm index 1fa5dff6669913304e84cd18f6f17ff6674d8d97..82b08732d56bde17b4db33c11eaec035aac8e4e7 100644 GIT binary patch literal 2079 zcmZ`%TXWk~5SC?GK3+S{#_>f}(M#%Wx~GbzP^;#b8!u|;LcBgqMU z?R4_U0}l+tKj4A){49O~dybBCDKH+NUG0AReY<;(rfF$S(^B-;>2Kb*?*`$haX4;7 zgV3GEQDek?9y(rQ5KN|l&wUC-?vNikA^eqvG@(I1979&&A*%`iE-EOiN@@p*)0)L` z;O_)}90s1pL&)tAzvH`s59aG2_FNy*+x{CcUH>?E%^`m%EB1pS_rOd(0RKg^q=YUp zFDc1Oq2;7bl0D-dA2~4xOh_-m*w7um40#lR@q_Qikm1KPKcr6{3?MxWCSb}y1esl# z$UB~=#3IO#7l#Z@3qUfDb^JxnGEb(a7V38FC+r{AV|cU4JBrX(I!1)v6iT zpT*9h$M>BnmD6|Vd53~P?p<8VE61DB>y$(yF`upaenin5 zV{t`BM7=@53!Gs)3?_oD^mht$)WBdGrszzePN$A(I@4&-XlbB39`{tWm`hS`tx^oF+xD%kK=XD0@@cHE9`s zC~Z~Z4buOFSZr*n?5EP!REJ+t?j}A|xov3;+_5y&@aly;SZGjU60zP^%qMA&bxL>|}QrK}oFmC%-(>+>6z%a9XF zl`g~QR9U23W!OnPx+RI~|7P?m=QBT}q?)-%2w6?r>oMG=%<5LVw}|bFG3biVSo&AS IKudoA0ElMOJOBUy literal 1849 zcma)4-E!Mh5SC?GK3+S{Mz$Q)ZJJd6q3IN_zP*#!}FOIS#4nv-Rc_bsy$TJ7A&%-Zy$j4sB0rTV~IR2}_iW+eVw4#Px3Nb(Mze#wS zg84Ge!XN_UyC}$@#7{^X6i@GupynJ?2&vg3gQTgJJBmJgXkoF$)TDv zlXRh}=Dkh67SMpe3v*2EG6t$D_afk@V5yY2e4lu;8Lg%KDCODalgCh+ijBZ(I-ku1 z|GkM9jk(LcQAVUvDDTE`$UV|?B6?Lx=ONGXnJnU`xd(Yzjw@4CI!huriBG>y`t)%C z;?RGVia-QFn1x@<;_*1-gzrfKmV4itLAwTeDV5j*zk~H@&`YfsNW-96H zfe*|1D*ZlDlydJ85kb`DDLv>kppN^okWOQFBDo3jo=>=v2g^TvJLk!(XHmwJV{b%k z2QmO+uP?lC&f$U2kG*-ADe3>abuElNe?N(*f|>Pq0d&;BU>X+aETB%Ojzv0)XwYe3 z2~1W((-9~G%XBLvqnofGZ3$~+b*xjYipvtI;R@lG(4w=B4azKIQ=(0@rLAI1+7ez- z_NuaLD*ukOpzw9vl=tRE{TAH~n)nfQzltBrtbw1B)$ucmUB^cw%)7V z(Rq=Mp2+m|frU3@gyGE`Loo;6SEyTLTSW4ID+#5*G6ws4)S(0pCk?fozIhiAX& zZUr|4a`?LLwrL%LtxX)S=iUNFE9&%ww$%%54bnz?A?ybd>yRF|hId79n|lAOcXphn z6lV!>HKtpPo>fh|&LB*~0W~kozNesPmF?3B1ZElH1+f>t*o~)+v zgB6uFiId)wj1WH*xZ&CJKbXPTt&(fw{dV0lEQ-pr*}FD;ZMcXJ-U5EoxxtQ|h8X>y z>%Do-^v=MsNhOoLoZgzy%IHH%1}?*g)OCG(pB616!`}>Iu+aNCC6(U#IV*N-A$MaT P*ER96sQ#5P(DL6ufWo0f diff --git a/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/general.kjsm b/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/general.kjsm index 45c8aa6a4296dd47162bb326b92f6e23ca53b400..b1dd049af1efa5208927a48bc8a1847889c17a31 100644 GIT binary patch delta 25 ccmcb|e2-axfq{V;h#7&H35eM?3Y=pE05FsTZvX%Q delta 25 bcmcb|e2-axfq{V;h#7&H2}ExcIL8P8Fna@P diff --git a/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/utilities/utilities.kjsm b/assets/v2/general/js/BHStudios General Scripts/org/bh/scripts/general/utilities/utilities.kjsm index 3c1e7968be1db36c4b5d0977c06a8bc7767b09f1..001ebe626649bef4ef4f7e1a0fe050862227fba3 100644 GIT binary patch delta 25 ccmZ3+w2VoBfq{V;h#7&H35eM?3WzZR03>z-MF0Q* delta 25 bcmZ3+w2VoBfq{V;h#7&H2}Exc5Mu-YBwYeP diff --git a/assets/v2/general/kt/src/jQueryInterface/jQuery Headers.kt b/assets/v2/general/kt/src/jQueryInterface/jQuery Headers.kt index babf507..c5786c2 100644 --- a/assets/v2/general/kt/src/jQueryInterface/jQuery Headers.kt +++ b/assets/v2/general/kt/src/jQueryInterface/jQuery Headers.kt @@ -69,9 +69,35 @@ external class JQuery { fun load(handler: EventHandler): JQuery fun change(handler: EventHandler): JQuery + fun append(str: String): JQuery - fun before(content: JQuery): JQuery + fun append(str: Element): JQuery + fun append(str: JQuery): JQuery + fun append(str: Array): JQuery + fun append(str: Array): JQuery + fun append(str: Array): JQuery + + fun prepend(str: String): JQuery + fun prepend(str: Element): JQuery + fun prepend(str: JQuery): JQuery + fun prepend(str: Array): JQuery + fun prepend(str: Array): JQuery + fun prepend(str: Array): JQuery + fun before(content: String): JQuery + fun before(content: Element): JQuery + fun before(content: JQuery): JQuery + fun before(content: Array): JQuery + fun before(content: Array): JQuery + fun before(content: Array): JQuery + + fun after(content: String): JQuery + fun after(content: Element): JQuery + fun after(content: JQuery): JQuery + fun after(content: Array): JQuery + fun after(content: Array): JQuery + fun after(content: Array): JQuery + /** * Remove the set of matched elements from the DOM. @@ -108,6 +134,10 @@ external class JQuery { +typealias JQueryProviderFunction = Element.(index: Int, html: String) -> T + + + open public external class MouseEvent(): Event { public val pageX: Double public val pageY: Double diff --git a/assets/v2/general/kt/src/org/bh/scripts/general/Main.kt b/assets/v2/general/kt/src/org/bh/scripts/general/Main.kt index 293c89a..ac5ad78 100644 --- a/assets/v2/general/kt/src/org/bh/scripts/general/Main.kt +++ b/assets/v2/general/kt/src/org/bh/scripts/general/Main.kt @@ -31,7 +31,7 @@ private object Setup { private fun connectAllSidebarsToSidebarButtons() { - val firstSidebarElement: Element? by lazy { jq(".${SidebarModel.className}")[0] } + val firstSidebarElement: Element? by lazy { jq(".${SidebarViewWrapper.className}")[0] } val controllers = jq(".show-sidebar-button").map { _, sidebarButtonElement -> val specifiedSidebarId = sidebarButtonElement.getAttributeNode("for")?.value diff --git a/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarController.kt b/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarController.kt index afad1ef..6f7ba9d 100644 --- a/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarController.kt +++ b/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarController.kt @@ -1,7 +1,7 @@ package org.bh.scripts.general.components.sidebar -import org.bh.scripts.general.components.sidebar.SidebarModel.Companion.sidebarShownClassName -import org.bh.scripts.general.components.sidebar.SidebarViewWrapper.Companion.defaultElementResponsibleForHidingAndShowingTheSidebar +import org.bh.scripts.general.components.sidebar.SidebarViewWrapper.Companion.sidebarShownClassName +import org.bh.scripts.general.components.sidebar.SidebarViewWrapper.Companion.defaultParentElement import org.w3c.dom.* import kotlin.properties.Delegates @@ -53,30 +53,12 @@ class SidebarController( } else { this.model.loadFromView(newView) + newView.scrimHtmlElement.click { toggleHidden() } } suppressChangeReactions = false } - override fun didShowOrHide(oldIsShown: Boolean, newIsShown: Boolean) { - if (suppressChangeReactions) { return } - - val view = this.view - - if (null == view) { - if (newIsShown) { - defaultElementResponsibleForHidingAndShowingTheSidebar.addClass(sidebarShownClassName) - } - else { - defaultElementResponsibleForHidingAndShowingTheSidebar.removeClass(sidebarShownClassName) - } - } - else { - view.isShown = newIsShown - } - } - - fun toggleHidden() { model.isShown = !model.isShown } @@ -95,6 +77,28 @@ class SidebarController( */ val allSidebars: SidebarController by lazy { SidebarController(SidebarModel(), null) } } + + + + // MARK: - SidebarModelDelegate + + override fun didShowOrHide(oldIsShown: Boolean, newIsShown: Boolean) { + if (suppressChangeReactions) { return } + + val view = this.view + + if (null == view) { + if (newIsShown) { + defaultParentElement.addClass(sidebarShownClassName) + } + else { + defaultParentElement.removeClass(sidebarShownClassName) + } + } + else { + view.isShown = newIsShown + } + } } diff --git a/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarModel.kt b/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarModel.kt index 4477073..598ae33 100644 --- a/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarModel.kt +++ b/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarModel.kt @@ -19,15 +19,15 @@ class SidebarModel private constructor(initIsShown: Boolean = false) { companion object { - const val className = "sidebar" - const val sidebarShownClassName = "sidebar-shown" private val existingModels = mutableMapOf() + operator fun invoke(viewWrapper: SidebarViewWrapper) = + invoke(id = viewWrapper.htmlElement.id, + isShown = viewWrapper.isShown) operator fun invoke(htmlElement: Element) = - invoke(id = htmlElement.id, - isShown = SidebarViewWrapper.defaultElementResponsibleForHidingAndShowingTheSidebar.hasClass(sidebarShownClassName)) + invoke(viewWrapper = SidebarViewWrapper(htmlElement = htmlElement)) operator fun invoke(id: String = "", isShown: Boolean = false): SidebarModel { return existingModels[id, { SidebarModel(initIsShown = isShown) } ] diff --git a/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarViewWrapper.kt b/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarViewWrapper.kt index bce93ba..e133e79 100644 --- a/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarViewWrapper.kt +++ b/assets/v2/general/kt/src/org/bh/scripts/general/components/sidebar/SidebarViewWrapper.kt @@ -13,20 +13,49 @@ import org.w3c.dom.Element * @since 2018-04-19 */ class SidebarViewWrapper( - override val htmlElement: Element + override val htmlElement: Element, + private val parentElement: JQuery = defaultParentElement ) : WrappedHtmlView { + + private var scrimHtmlElementGetter = scrimElementGetter(parentElement) + + val scrimHtmlElement get() = scrimHtmlElementGetter() + var isShown: Boolean - get() = elementResponsibleForHidingAndShowingTheSidebar.hasClass(SidebarModel.sidebarShownClassName) - set(newValue) { - if (newValue) - elementResponsibleForHidingAndShowingTheSidebar.addClass(SidebarModel.sidebarShownClassName) - else - elementResponsibleForHidingAndShowingTheSidebar.removeClass(SidebarModel.sidebarShownClassName) + get() = parentElement.hasClass(sidebarShownClassName) + set(newValue) = if (newValue) show() else hide() + + + init { + if (0 == scrimHtmlElementGetter().length) { + parentElement.prepend(generateNewScrimHtmlString()) } + } + + + private fun hide() { + parentElement.removeClass(sidebarShownClassName) + } + + + private fun show() { + parentElement.addClass(sidebarShownClassName) + } - val elementResponsibleForHidingAndShowingTheSidebar get() = defaultElementResponsibleForHidingAndShowingTheSidebar companion object { - val defaultElementResponsibleForHidingAndShowingTheSidebar = jq(":root") + const val className = "sidebar" + const val sidebarShownClassName = "sidebar-shown" + const val scrimElementClassName = "sidebar-scrim" + + val defaultParentElement = jq(":root") + fun scrimElementGetter(parentElement: JQuery): () -> JQuery = { + /*return*/ jq(selector = ".$scrimElementClassName", context = parentElement) + } + + + fun generateNewScrimHtmlString(): String { + return """
""" + } } }