Merge branch 'pr/1916' into dev

Author: Lionel Laské

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Rewrite of Sugarizer Core using Vue.js
 - Allow de-coloring a country in Color My World #1890
+- Ability to resize images in Fototoon #1551
 
 ### Fixed
 - Bug in Jappy activity editor during initial rendering #1738

activities/Fototoon.activity/js/activity.js

@@ -204,22 +204,26 @@ define(["sugar-web/activity/activity","sugar-web/datastore","sugar-web/env","tex
             };
             toonModel.showWait();
             if (editMode) {
-                toonModel.initPreviews();
+                // Wait for all previews to be generated before showing sort view
+                toonModel.initPreviews(function(){;
                 // resize the canvas
                 sortCanvas.width = window.innerWidth - sugarCellSize * 2;
                 var boxWidth = sortCanvas.width / toonModel.getData()['boxs'].length;
                 sortCanvas.height = boxWidth * 3 / 4;
                 sortCanvas.style.left = ((window.innerWidth - sortCanvas.width) / 2) + "px";
                 sortCanvas.style.top = ((window.innerHeight - sortCanvas.height) / 2) + "px";
                 toonModel.initSort(sortCanvas);
+                toonModel.hideWait();
+                    // switch editMode
+                    editMode = !editMode;
+                });
             } else {
                 toonModel.finishSort();
                 toonModel.init();
+                toonModel.hideWait();
+                // switch editMode
+                editMode = ! editMode;
             };
-            toonModel.hideWait();
-            // switch editMode
-            editMode = ! editMode;
-
         });
 
         var cleanAllButton = document.getElementById("clean-all-button");