Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6455f6e20efee02e4c447821693548724bb9cf8c -r4f6c07c270475353380998f303bb19e3caaa063f
--- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6455f6e20efee02e4c447821693548724bb9cf8c)
+++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4f6c07c270475353380998f303bb19e3caaa063f)
@@ -524,7 +524,7 @@
authoring.fla.import.part.dialog.title =Import activities
authoring.fla.run.sequences.folder =
authoring.fla.arrange.confirm =There are annotations on the canvas.\\n\ They will be not arranged automatically, you will have to adjust them manually later.\\n\ Do you want to continue?
-authoring.fla.clear.canvas.confirm =Are you sure you want to remove all existing elements?
+authoring.fla.clear.canvas.confirm =You have got unsaved changes. They will be lost. Do you want to continue?
authoring.fla.branching.start.place.prompt =Place the branching point
authoring.fla.branching.end.place.prompt =Place the converge point
authoring.fla.annotation.region.place.prompt =Click and hold to start drawing an annotation region
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r4a83c347cf1a9d2577082a823353d7da42b2e3a5 -r4f6c07c270475353380998f303bb19e3caaa063f
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4a83c347cf1a9d2577082a823353d7da42b2e3a5)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4f6c07c270475353380998f303bb19e3caaa063f)
@@ -519,7 +519,7 @@
authoring.fla.import.part.dialog.title =Import activities
authoring.fla.run.sequences.folder =
authoring.fla.arrange.confirm =There are annotations on the canvas.\\n\ They will be not arranged automatically, you will have to adjust them manually later.\\n\ Do you want to continue?
-authoring.fla.clear.canvas.confirm =Are you sure you want to remove all existing elements?
+authoring.fla.clear.canvas.confirm =You have got unsaved changes. They will be lost. Do you want to continue?
authoring.fla.branching.start.place.prompt =Place the branching point
authoring.fla.branching.end.place.prompt =Place the converge point
authoring.fla.annotation.region.place.prompt =Click and hold to start drawing an annotation region
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r2d51ee8a959ecba6a2f6ac2da80b7b9857bc50d0 -r4f6c07c270475353380998f303bb19e3caaa063f
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 2d51ee8a959ecba6a2f6ac2da80b7b9857bc50d0)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js (.../authoringGeneral.js) (revision 4f6c07c270475353380998f303bb19e3caaa063f)
@@ -1492,11 +1492,7 @@
*/
newLearningDesign : function(force){
// force means that user should not be asked for confirmation.
- if (!force && (layout.activities.length > 0
- || layout.regions.length > 0
- || layout.labels.length > 0
- || layout.floatingActivity)
- && !confirm(LABELS.CLEAR_CANVAS_CONFIRM)){
+ if (!force && layout.modified && !confirm(LABELS.CLEAR_CANVAS_CONFIRM)){
return;
}
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r64e6623bc68b11257c7f5d71f3953154f80b6fde -r4f6c07c270475353380998f303bb19e3caaa063f
--- lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 64e6623bc68b11257c7f5d71f3953154f80b6fde)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js (.../authoringMenu.js) (revision 4f6c07c270475353380998f303bb19e3caaa063f)
@@ -405,6 +405,9 @@
* Opens a pop up for importing LD. Loads the imported LD to canvas.
*/
importLearningDesign : function(){
+ if (layout.modified && !confirm(LABELS.CLEAR_CANVAS_CONFIRM)) {
+ return;
+ }
var dialog = showDialog("dialogImportLearningDesign", {
'modal' : true,
'height' : 350,
@@ -482,6 +485,9 @@
* Opens "Open sequence" dialog where an user can choose a Learning Design to load.
*/
openLearningDesign : function(){
+ if (layout.modified && !confirm(LABELS.CLEAR_CANVAS_CONFIRM)) {
+ return;
+ }
layout.ldStoreDialog.data('prepareForOpen')(LABELS.OPEN_DIALOG_TITLE, null,
'#ldStoreDialogOpenButton, #ldStoreDialogCancelButton', false);
layout.ldStoreDialog.modal('show');