From eb47000141de562af8d096fd73221ee204fcc855 Mon Sep 17 00:00:00 2001 From: grahamb <..@..> Date: Fri, 30 Apr 2021 13:31:17 +1200 Subject: [PATCH] calendar/amd/src/ calendar.js - refreshDayContent use Template.replaceNodeContent instead of replaceNode --- calendar/amd/build/calendar.min.js | Bin 2853 -> 2919 bytes calendar/amd/build/calendar.min.js.map | Bin 17018 -> 17373 bytes calendar/amd/build/view_manager.min.js | Bin 7820 -> 7871 bytes calendar/amd/build/view_manager.min.js.map | Bin 29405 -> 29631 bytes calendar/amd/src/calendar.js | 7 ++++--- calendar/amd/src/view_manager.js | 8 +++++--- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/calendar/amd/build/calendar.min.js b/calendar/amd/build/calendar.min.js index 2553e0b2fbf8180ba56a2f1737cd69ca47eeeac1..0e57a09fc4dfb705a52b6de913cf619075960dba 100644 GIT binary patch delta 113 zcmZ1~_FQa3ID3jtwr!$DfnIWAPHJ9CVv%oRW}c>Xa(-TMeom@hPJX(ElAV%Hl1`Fd zT4r7fx#(l1{2lx=w~prcRbl(&pXlYnTC> CNf5^X diff --git a/calendar/amd/build/calendar.min.js.map b/calendar/amd/build/calendar.min.js.map index aa84975f2fb54ff7448cbb3eccf8ac62446d65d2..99b860e1d1ad376e8cdb5942a9f13be6392c818c 100644 GIT binary patch delta 969 zcmah|&1(};5NAX20}Y5t^I=O!YiXi9lLl)|)CzCk+r-e;w#HIZ1dVB$Y)yBQ>{63l z>Ot@#MVOm{_$LTCh!+n%coP2up=Xbx7g6xdY{A^jVKQI8-^|XN`Sncu`doW=Ze+Y# zY1XXGN@uBJT9a(DYFm!otSPN&*9YN|@BT(kEHJ@&8ATyu;GZB-MQQ4!&q`M2+(Kg| zi*hw51zYBPnZkkUxH-4U&!yZ-VFdJf17$a!J+=L^KR$a8b@lMD9>P zm5ZE`uD;gV6$tH?c7DX*Yn71JbkEF7K9 z>RhUBR0p=~3s&Tks6|h*HO|*Dt6|XR5xZzhR^>de8W$Y9FIw>F>|JdK#sX=r0}Fxq z<6BbEnL6w%&klSH%xM<<3?#L6hy}-eT>}pNQ}8fYQNe>?Lfe3E!QxVz=s8yf)%Z{r zy3{;9j_4W8Q3H8|0b8^v*^|4NEQ%h!M8I8mI{HAdAC6A@Is#q>LJ$k>``h@Ld<9e1 z`tTu?4A@k`E9yb}@FR3}!l8kBZ3s1wBIn!QQ|PRu&^=fTC#SpQT0%b2({Uq+yOtx? zqwSf4SK-T=3tz$+|6>ApYvaPHi1eu`twch>4h877>8%Z^0=>wD!o7}+X>E8P5x%B` z-;o(*T#8PeNH5^#nu}15j{6!Co4&%3*y-UiaFD$S6X}qD*vSURa_-5$CNCbl delta 714 zcmXX^%}*0S6wi{zXdnT|^TJ~0fW^MO&k2F8 zthg!`On4~QgasI4*Axy&J_+YgYyfO(k*9dw7cZ_9EdX2806{I_?9toAy0J??6Gg+L ziR6Pz+fv1~sgW!y_*L?ru}7bih3Qr8Z*mA~=Z;d@&vl2jz#5#T-YE4+>ZY+yA5zY; z%f|s|{VsQ08}J35aYAT`P|avt7e01b9PrB5Lnrb#G+ztIN^hz3^Yn~r@mu=OMkOBE|=>%`gWc2xv8--(xaRe@7X#c`pXVY x1-{FbjQ!Eq-03v^UYek#`{}c4JT~zCAx%|hqs^~Mg5KYX(P=(DI;ys={09#-%i;h4 diff --git a/calendar/amd/build/view_manager.min.js b/calendar/amd/build/view_manager.min.js index f69895d14db6f2b2ef95899efb99b24d18542413..37c3ed41f002e822274dce5338305fb3bcd83def 100644 GIT binary patch delta 201 zcmeCN-EX_$B&S7&ZL(fUVo73gYKdNMeqKq2P9~B_N@Ar>77{->zqF`0H8Vvgdom-J zHfx4X7LaAgrNo#yc?P%rqB@CsX_CK5k6zqF`0H8VvgYceC3 zHfy?0CXi*wrNo#qc`dj77%Q6xLWAdZ-C;9LGOtvu4vKt~c@eC&X5XV0OHAoy1O@5=bbik~EI(I9Vr- zlg6PSD)oX8r*{WVTq=GfO9(iCdVmuWLG+5m1r-SiR3xOH2=m^ikcxsT!5&7t^M2-g z@B8NMcR#St@30SVIZj?#S}$2EOO5R6bTASy5#Lxui5rM0o(Gmvd(F}g9p+QV+3b@nx@#A4~+oDzMwcm3sGqwRwxP6YM z0gFC&hjn3xjPn>PqEK)zuo`rp@;LX?xRs;*7<}zEoT+0wVTgJIECqS*0NaA)?oqY| zuPKVB&_WbbquHwjjl#3*aL_%(TJU?f!Yt_XBzm{V8aFX}GD9CJf?v-@pzb*(F}&$n zbgieg9G^t5iL7=}0^Ei}PrRc+aZLiAG&X?usOm1d&Y+=~)n+-*%QrF8N^3>Vi+GF} z1?@>MOTs%nH=OHqm|fh1rR;b|B*vTGsrX83%VM-ACKZQI~=L0sf*)!J<@6CAsi z(e{D*hU0IN@WJ)7AN->%&elzB>Zrz=F@vfsm2h1n!9PW-lqITWau8LsH8`go6Ui(x z7&lNQ`7pJ}Mpn0xMKY3dRVvyS8h?5fJNW`GHe!qXNo$lQ`Y36_@N=lID^9@dpv>i#fMPD(o56@~Ld5831z*QDniSrpL zAIXB$_*4oOf+G)C&VRrBvv7N;SKiyZLt~C=8uVe#8qgTN{ESY`dH}Q(xSX{%=CWAJ zVtXqB7&Wi5n1qVk_%l+@tic8X)34&HzKNQH-jSzV~P~RTkuI_myLj~ z_sKgpt$%u^A&_iJVqT?IUBolR9vYHjX2&ro<{GdT3;0{KO--Qt7neaMPl&=Eyd4|v zO42xy=A5JnV};fJKK7*xep~Q5kN?F&?RU+hD_&hy27}F|M!D2fu3b~?w_*9SD>p03 z*qEY+UVh0^jvm_zn=6X@*#9te-u8H<9hq}GPW<^l{Bg2}!QrA0KAP(Sf1%X=>C&&B FKLD6-6}kWb delta 1499 zcmcIkO>7fK6xO&%ttw2YW3TOOLhL%J8@$+#*NGiSi)P36#)J?Ol9qsi2tQ4*lNcxQ zPbw}*y@CQyJ+_ET)LRiNIP`*A2_!B+df>)^142khHHJC@OG3aCzFcwMDaj5>MCTkJl`v``c3TsLM+3eS8q5?bqfSNZ4}{xH^dfT>2r^> zmeGbdACjF!7d+kJW8JXo{lQtF=Js`71%K1mg_u@DyP(@2b@4Q2l`HVG3= zNj3{l!#fewO4A<9ZdTja3~-DKh)01l__YX^)p1t0*3`a_kmQDl0!Lb%>|Ho*g5^LM z54aQP+Thg_su4?^OKe43(u$!KQTAC{&5JsW1bM4XZBJIqa*<03BrqfC5;lRSU{zD$ zZqWSD+`hbo7gj>sh~r*Y-5Ah>HgE8v;F`(#z&w22=4Cppsd?*Co8kDM0)F^7{Og-k z_+loj4RZdC&B?Gf%K6FTG8TxeZi+%*7s(4xzI2jMyCBigg4*owP(0lvxy@^dm^4#4 z_^c(wl5nYGPwxrY{974p2B#^XhGA6l+G)^5-rgnx3)@>8I|)zOK7{;Sh2`y2WS7ue zt)e<&2CPK>e4Ps>g;v>cK|)mFmezq*MV(y{Lp#a&FnR##9^g2Y@G#i*zN8<8L(ygw zwif-$5fN}b%5hHqiXI6q5<9P06hVKfaN%1Fj|1$M`)XqfBqRveN0@!#4{3n>6K$>Ky{uLClOsuX6gRBPZ^ z8Lo96cGqPyU0RSQ47*(o+7jUgy$`2_Pf_uVk%U8ua(msx(Ry}JxzG^JhCklMZx+`zvY7SW|LLSrCbo{UxuX#zqK@WjzPGv KVm&{6+xsu;y|kAA diff --git a/calendar/amd/src/calendar.js b/calendar/amd/src/calendar.js index 96c0b087b5f..1b99e6a0e95 100644 --- a/calendar/amd/src/calendar.js +++ b/calendar/amd/src/calendar.js @@ -179,9 +179,10 @@ define([ month = dayLink.data('month'), day = dayLink.data('day'), courseId = dayLink.data('courseid'), - categoryId = dayLink.data('categoryid'); - CalendarViewManager.refreshDayContent(root, year, month, day, courseId, categoryId, root, - 'core_calendar/calendar_day').then(function() { + categoryId = dayLink.data('categoryid'), + calendarMain = $(CalendarSelectors.calendarMain); + CalendarViewManager.refreshDayContent(calendarMain, year, month, day, courseId, categoryId, + calendarMain, 'core_calendar/calendar_day').then(function() { e.preventDefault(); var url = '?view=day&time=' + dayLink.data('timestamp'); return window.history.pushState({}, '', url); diff --git a/calendar/amd/src/view_manager.js b/calendar/amd/src/view_manager.js index 37fca710b17..facec3fafb7 100644 --- a/calendar/amd/src/view_manager.js +++ b/calendar/amd/src/view_manager.js @@ -118,7 +118,7 @@ const registerEventListeners = (root) => { return window.history.pushState({}, '', '?view=month'); }).fail(Notification.exception); } else if (view == 'day') { - refreshDayContent(root, year, month, day, courseId, categoryId, root, 'core_calendar/calendar_day') + refreshDayContent(root, year, month, day, courseId, categoryId, root.find(CalendarSelectors.calendarMain), 'core_calendar/calendar_day') .then(() => { return window.history.pushState({}, '', '?view=day'); }).fail(Notification.exception); @@ -235,7 +235,9 @@ export const reloadCurrentMonth = (root, courseId = 0, categoryId = 0) => { export const refreshDayContent = (root, year, month, day, courseId, categoryId, target = null, template = '') => { startLoading(root); - target = target || root.find(CalendarSelectors.wrapper); + if (!target || target.length == 0){ + target = root.find(CalendarSelectors.calendarMain); + } template = template || root.attr('data-template'); M.util.js_pending([root.get('id'), year, month, day, courseId, categoryId].join('-')); const includenavigation = root.data('includenavigation'); @@ -245,7 +247,7 @@ export const refreshDayContent = (root, year, month, day, courseId, categoryId, return Templates.render(template, context); }) .then((html, js) => { - return Templates.replaceNode(target, html, js); + return Templates.replaceNodeContents(target, html, js); }) .then(() => { document.querySelector('body').dispatchEvent(new CustomEvent(CalendarEvents.viewUpdated)); -- 2.27.0