Merge pull request #57 from rishabhdixit/master

Fixed issue : Initial data is showing on the app before the content is loaded, #119334307

Author: DanielHindi

control/content/content.controller.js

@@ -10,17 +10,20 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
 
     $scope.editorOptions = folderPluginShared.getEditorOptions();
 
-    $scope.data = folderPluginShared.getDefaultScopeData();
+//    $scope.data = folderPluginShared.getDefaultScopeData();
 
-    $scope.data._buildfire = {
-        "plugins": {
-            "dataType": "pluginInstance",
-            "data": []
-        }
-    };
+    $scope.masterData = folderPluginShared.getDefaultScopeData();
 
     $scope.datastoreInitialized = false;
 
+    function isUnchanged(data) {
+        return angular.equals(data, $scope.masterData);
+    }
+
+    function updateMasterItem(data) {
+        $scope.masterData = angular.copy(data);
+    }
+
     /*
      * Go pull any previously saved data
      * */
@@ -40,11 +43,11 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
 
             $scope.data = result.data;
             $scope.id = result.id;
-            if ($scope.data.content && $scope.data.content.carouselImages) {
+            if ($scope.data && $scope.data.content && $scope.data.content.carouselImages) {
                 editor.loadItems($scope.data.content.carouselImages);
             }
 
-            if ($scope.data._buildfire && $scope.data._buildfire.plugins && $scope.data._buildfire.plugins.result) {
+            if ($scope.data && $scope.data._buildfire && $scope.data._buildfire.plugins && $scope.data._buildfire.plugins.result) {
                 var pluginsData = folderPluginShared.getPluginDetails($scope.data._buildfire.plugins.result, $scope.data._buildfire.plugins.data);
                 if ($scope.data.content && $scope.data.content.loadAllPlugins) {
                     if(pluginsData.length){
@@ -60,7 +63,7 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
                 }
             }
 
-            if (!$scope.data._buildfire) {
+            if ($scope.data && !$scope.data._buildfire) {
                 $scope.data._buildfire = {
                     plugins: {
                         dataType: "pluginInstance",
@@ -69,7 +72,7 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
                 };
             }
 
-            if (!$scope.data.design) {
+            if ($scope.data && !$scope.data.design) {
                 $scope.data.design = {
                     backgroundImage: null,
                     selectedLayout: 1,
@@ -107,20 +110,24 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
             newObj._buildfire.plugins.result = plugins.items;
         }
 
+        updateMasterItem(newObj);
+
         folderPluginShared.save(newObj);
     };
 
     /*
      * create an artificial delay so api isnt called on every character entered
      * */
-    var saveDataWithDelay = function (newObj, oldObj) {
+    var saveDataWithDelay = function (newObj) {
 
         if (tmrDelay) clearTimeout(tmrDelay);
-        if (angular.equals(newObj, oldObj)) return;
+        if (isUnchanged(newObj)) {
+            return;
+        }
         if(newObj.default){
             newObj=folderPluginShared.getDefaultScopeBlankData();
             editor.loadItems([]);
-            $scope.data.content.text=""
+            $scope.data = newObj;
         }
         tmrDelay = setTimeout(function () {
             saveData(newObj);

widget/widget.controller.js

@@ -194,7 +194,7 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', '$sce','$timeout','$ro
     $scope.setWidth = function () {
         $rootScope.deviceWidth = window.innerWidth || 320;
     };
-    $scope.data = folderPluginShared.getDefaultScopeData();
+//    $scope.data = folderPluginShared.getDefaultScopeData();
 
     function initDeviceSize(callback) {
         $scope.deviceHeight = window.innerHeight;
@@ -318,7 +318,7 @@ folderPluginApp.controller('folderPluginCtrl', ['$scope', '$sce','$timeout','$ro
     var searchOptions = {pageIndex:0,pageSize:10};
 
     function dataLoadedHandler(result) {
-
+        $scope.data = result.data;
         searchOptions.pageIndex=0;
         var pluginsList = null;
         if (result && result.data && !angular.equals({}, result.data) && result.data.content && result.data.design) {