diff --git a/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js b/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js index 48f6fc50b..1bf1d905a 100644 --- a/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js +++ b/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js @@ -1,3 +1,3 @@ -define("assignfeedback_onenote/onenotedelete",["jquery","core/templates","core/ajax","core/notification","core/str","core/modal_factory","core/modal_events"],(function($,templates,ajax,notification,Str,ModalFactory,ModalEvents){return{init:function(){var trigger=$("#deleteuserfeedback"),gradeid=$(trigger).attr("gradeid"),contextid=$(trigger).attr("contextid"),userid=$(trigger).attr("userid");ModalFactory.create({type:ModalFactory.types.SAVE_CANCEL,title:Str.get_string("deletefeedbackconfirm","assignfeedback_onenote"),body:Str.get_string("deletefeedbackconfirmdetail","assignfeedback_onenote")},trigger).done((function(modal){modal.getRoot().on(ModalEvents.save,(function(e){e.preventDefault(),ajax.call([{methodname:"mod_assign_feedback_onenote_delete",args:{contextid:contextid,gradeid:gradeid,userid:userid}}])[0].done((function(){location.reload()})).fail(notification.exception)}))}))}}})); +define("assignfeedback_onenote/onenotedelete",["jquery","core/ajax","core/notification","core/str","core/modal_delete_cancel","core/modal_events"],(function($,ajax,notification,Str,ModalDeleteCancel,ModalEvents){return{init:function(){var trigger=$("#deleteuserfeedback"),gradeid=$(trigger).attr("gradeid"),contextid=$(trigger).attr("contextid"),userid=$(trigger).attr("userid");trigger.on("click",(function(e){e.preventDefault(),Str.get_strings([{key:"deletefeedbackconfirm",component:"assignfeedback_onenote"},{key:"deletefeedbackconfirmdetail",component:"assignfeedback_onenote"}]).then((function(strings){return ModalDeleteCancel.create({title:strings[0],body:strings[1]})})).then((function(modal){return modal.getRoot().on(ModalEvents.delete,(function(e){e.preventDefault(),ajax.call([{methodname:"mod_assign_feedback_onenote_delete",args:{contextid:contextid,gradeid:gradeid,userid:userid}}])[0].done((function(){location.reload()})).fail(notification.exception)})),modal.show(),modal})).catch(notification.exception)}))}}})); //# sourceMappingURL=onenotedelete.min.js.map \ No newline at end of file diff --git a/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js.map b/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js.map index 4086e6c22..d885b4e77 100644 --- a/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js.map +++ b/mod/assign/feedback/onenote/amd/build/onenotedelete.min.js.map @@ -1 +1 @@ -{"version":3,"file":"onenotedelete.min.js","sources":["../src/onenotedelete.js"],"sourcesContent":["define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str', 'core/modal_factory', 'core/modal_events'],\n function($, templates, ajax, notification, Str, ModalFactory, ModalEvents) {\n return {\n init: function() {\n var trigger = $('#deleteuserfeedback');\n var gradeid = $(trigger).attr('gradeid');\n var contextid = $(trigger).attr('contextid');\n var userid = $(trigger).attr('userid');\n ModalFactory.create({\n type: ModalFactory.types.SAVE_CANCEL,\n title: Str.get_string('deletefeedbackconfirm', 'assignfeedback_onenote'),\n body: Str.get_string('deletefeedbackconfirmdetail', 'assignfeedback_onenote'),\n }, trigger)\n .done(function(modal) {\n modal.getRoot().on(ModalEvents.save, function(e) {\n // Stop the default save button behaviour which is to close the modal.\n e.preventDefault();\n var requests = ajax.call([{\n methodname: 'mod_assign_feedback_onenote_delete',\n args: {contextid: contextid, gradeid: gradeid, userid: userid}\n }]);\n\n requests[0].done(function() {\n location.reload();\n }).fail(notification.exception);\n });\n });\n }\n };\n }\n);\n"],"names":["define","$","templates","ajax","notification","Str","ModalFactory","ModalEvents","init","trigger","gradeid","attr","contextid","userid","create","type","types","SAVE_CANCEL","title","get_string","body","done","modal","getRoot","on","save","e","preventDefault","call","methodname","args","location","reload","fail","exception"],"mappings":"AAAAA,8CAAO,CAAC,SAAU,iBAAkB,YAAa,oBAAqB,WAAY,qBAAsB,sBACpG,SAASC,EAAGC,UAAWC,KAAMC,aAAcC,IAAKC,aAAcC,mBACnD,CACHC,KAAM,eACEC,QAAUR,EAAE,uBACZS,QAAUT,EAAEQ,SAASE,KAAK,WAC1BC,UAAYX,EAAEQ,SAASE,KAAK,aAC5BE,OAASZ,EAAEQ,SAASE,KAAK,UAC7BL,aAAaQ,OAAO,CAChBC,KAAMT,aAAaU,MAAMC,YACzBC,MAAOb,IAAIc,WAAW,wBAAyB,0BAC/CC,KAAMf,IAAIc,WAAW,8BAA+B,2BACrDV,SACEY,MAAK,SAASC,OACXA,MAAMC,UAAUC,GAAGjB,YAAYkB,MAAM,SAASC,GAE1CA,EAAEC,iBACaxB,KAAKyB,KAAK,CAAC,CACtBC,WAAY,qCACZC,KAAM,CAAClB,UAAWA,UAAWF,QAASA,QAASG,OAAQA,WAGlD,GAAGQ,MAAK,WACbU,SAASC,YACVC,KAAK7B,aAAa8B"} \ No newline at end of file +{"version":3,"file":"onenotedelete.min.js","sources":["../src/onenotedelete.js"],"sourcesContent":["define(['jquery', 'core/ajax', 'core/notification', 'core/str', 'core/modal_delete_cancel', 'core/modal_events'],\n function($, ajax, notification, Str, ModalDeleteCancel, ModalEvents) {\n return {\n init: function() {\n var trigger = $('#deleteuserfeedback');\n var gradeid = $(trigger).attr('gradeid');\n var contextid = $(trigger).attr('contextid');\n var userid = $(trigger).attr('userid');\n\n trigger.on('click', function(e) {\n e.preventDefault();\n Str.get_strings([\n {key: 'deletefeedbackconfirm', component: 'assignfeedback_onenote'},\n {key: 'deletefeedbackconfirmdetail', component: 'assignfeedback_onenote'},\n ]).then(function(strings) {\n return ModalDeleteCancel.create({\n title: strings[0],\n body: strings[1],\n });\n }).then(function(modal) {\n modal.getRoot().on(ModalEvents.delete, function(e) {\n // Stop the default delete button behaviour which is to close the modal.\n e.preventDefault();\n var requests = ajax.call([{\n methodname: 'mod_assign_feedback_onenote_delete',\n args: {contextid: contextid, gradeid: gradeid, userid: userid}\n }]);\n\n requests[0].done(function() {\n location.reload();\n }).fail(notification.exception);\n });\n modal.show();\n return modal;\n }).catch(notification.exception);\n });\n }\n };\n }\n);\n"],"names":["define","$","ajax","notification","Str","ModalDeleteCancel","ModalEvents","init","trigger","gradeid","attr","contextid","userid","on","e","preventDefault","get_strings","key","component","then","strings","create","title","body","modal","getRoot","delete","call","methodname","args","done","location","reload","fail","exception","show","catch"],"mappings":"AAAAA,8CAAO,CAAC,SAAU,YAAa,oBAAqB,WAAY,2BAA4B,sBACxF,SAASC,EAAGC,KAAMC,aAAcC,IAAKC,kBAAmBC,mBAC7C,CACHC,KAAM,eACEC,QAAUP,EAAE,uBACZQ,QAAUR,EAAEO,SAASE,KAAK,WAC1BC,UAAYV,EAAEO,SAASE,KAAK,aAC5BE,OAASX,EAAEO,SAASE,KAAK,UAE7BF,QAAQK,GAAG,SAAS,SAASC,GACzBA,EAAEC,iBACFX,IAAIY,YAAY,CACZ,CAACC,IAAK,wBAAyBC,UAAW,0BAC1C,CAACD,IAAK,8BAA+BC,UAAW,4BACjDC,MAAK,SAASC,gBACNf,kBAAkBgB,OAAO,CAC5BC,MAAOF,QAAQ,GACfG,KAAMH,QAAQ,QAEnBD,MAAK,SAASK,cACbA,MAAMC,UAAUZ,GAAGP,YAAYoB,QAAQ,SAASZ,GAE5CA,EAAEC,iBACab,KAAKyB,KAAK,CAAC,CACtBC,WAAY,qCACZC,KAAM,CAAClB,UAAWA,UAAWF,QAASA,QAASG,OAAQA,WAGlD,GAAGkB,MAAK,WACbC,SAASC,YACVC,KAAK9B,aAAa+B,cAEzBV,MAAMW,OACCX,SACRY,MAAMjC,aAAa+B"} \ No newline at end of file diff --git a/mod/assign/feedback/onenote/amd/src/onenotedelete.js b/mod/assign/feedback/onenote/amd/src/onenotedelete.js index f2c36b2a9..e605f7029 100644 --- a/mod/assign/feedback/onenote/amd/src/onenotedelete.js +++ b/mod/assign/feedback/onenote/amd/src/onenotedelete.js @@ -1,19 +1,25 @@ -define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str', 'core/modal_factory', 'core/modal_events'], - function($, templates, ajax, notification, Str, ModalFactory, ModalEvents) { +define(['jquery', 'core/ajax', 'core/notification', 'core/str', 'core/modal_delete_cancel', 'core/modal_events'], + function($, ajax, notification, Str, ModalDeleteCancel, ModalEvents) { return { init: function() { var trigger = $('#deleteuserfeedback'); var gradeid = $(trigger).attr('gradeid'); var contextid = $(trigger).attr('contextid'); var userid = $(trigger).attr('userid'); - ModalFactory.create({ - type: ModalFactory.types.SAVE_CANCEL, - title: Str.get_string('deletefeedbackconfirm', 'assignfeedback_onenote'), - body: Str.get_string('deletefeedbackconfirmdetail', 'assignfeedback_onenote'), - }, trigger) - .done(function(modal) { - modal.getRoot().on(ModalEvents.save, function(e) { - // Stop the default save button behaviour which is to close the modal. + + trigger.on('click', function(e) { + e.preventDefault(); + Str.get_strings([ + {key: 'deletefeedbackconfirm', component: 'assignfeedback_onenote'}, + {key: 'deletefeedbackconfirmdetail', component: 'assignfeedback_onenote'}, + ]).then(function(strings) { + return ModalDeleteCancel.create({ + title: strings[0], + body: strings[1], + }); + }).then(function(modal) { + modal.getRoot().on(ModalEvents.delete, function(e) { + // Stop the default delete button behaviour which is to close the modal. e.preventDefault(); var requests = ajax.call([{ methodname: 'mod_assign_feedback_onenote_delete', @@ -24,7 +30,10 @@ define(['jquery', 'core/templates', 'core/ajax', 'core/notification', 'core/str' location.reload(); }).fail(notification.exception); }); - }); + modal.show(); + return modal; + }).catch(notification.exception); + }); } }; }