Merge pull request #19 from sakshityagi/master

DanielHindi · DanielHindi · commit 038760203e4c · 2016-04-01T10:20:14.000-07:00
Showed dummy data in case user has not interacted with plugin data yet
diff --git a/control/content/app.js b/control/content/app.js
@@ -20,11 +20,10 @@ webviewPluginApp.controller("webviewPluginCtrl", ["$scope", "$log", "$timeout",
       console.error("Error: ", err);
       return;
     }
-
-    if (result && result.data && !angular.equals({}, result.data)) {
+    if (result && result.data && !angular.equals({}, result.data) && result.id) {
       $scope.data = result.data;
       $scope.id = result.id;
-      if (typeof result.data.content.openInApp != 'undefined') {
+      if (typeof result.data.content.openInApp != 'undefined' && typeof result.data.content.openInApp != 'object') {
         if (result.data.content.openInApp)
           $scope.data.content.view = $scope.viewType.NATIVE_IN_APP;
         else
@@ -33,7 +32,7 @@ webviewPluginApp.controller("webviewPluginCtrl", ["$scope", "$log", "$timeout",
     } else {
       $scope.data = {
         content: {
-          url: "",
+          url: "http://hellacompany.com/",
           view: $scope.viewType.NATIVE_IN_APP
         }
       };
@@ -83,7 +82,8 @@ webviewPluginApp.controller("webviewPluginCtrl", ["$scope", "$log", "$timeout",
       if (!/^https?\:\/\//.test(data.content.url)) {
         data.content.url = "http://" + data.content.url;
       }
-      if (data.content.openInApp != 'undefined')
+
+      if (data.content.openInApp != undefined)
         data.content.openInApp = null;
       buildfire.datastore.save(data, function (err, result) {
         if (err || !result) {
@@ -104,8 +104,10 @@ webviewPluginApp.controller("webviewPluginCtrl", ["$scope", "$log", "$timeout",
     dataChanged = true;
     if (!$scope.frmMain.$invalid) {
       var data = $scope.data;
-      if (data.content.openInApp != 'undefined')
+      console.log("***********save", data.content.openInApp);
+      if (data.content.openInApp != undefined) {
         data.content.openInApp = null;
+      }
       buildfire.datastore.save(data, function (err, result) {
         if (err || !result) {
           $log.error('Error saving the widget details: ', err);
@@ -127,5 +129,5 @@ webviewPluginApp.controller("webviewPluginCtrl", ["$scope", "$log", "$timeout",
         $log.info('Widget details saved');
       }
     });
-  }
+  };
 }]);
diff --git a/widget/index.html b/widget/index.html
@@ -26,7 +26,8 @@
   </style>
 </head>
 <body class="no-scroll" ng-controller="webviewPluginCtrl" ng-cloak>
-<div class="scrollable" ng-if="(data.content.view == 'Native In App') || data.content.openInApp">
+<div class="scrollable"
+     ng-if="(data.content.view == 'Native In App') || data.content.openInApp">
   <iframe ng-src="{{ url }}"
           style="height:100%; width:1px; min-width:100%;"
           scrolling="auto"
@@ -64,6 +65,7 @@ <h2>Success!</h2>
 
     function dataLoadedHandler(result) {
       var content = null;
+      console.log("________________", result);
       if (result && result.data && !angular.equals({}, result.data)) {
         if (result.data.content) {
           content = result.data.content;
@@ -87,6 +89,21 @@ <h2>Success!</h2>
             buildfire.spinner.hide();
           });
         }
+      } else {
+        content = {
+          view: "Native In App",
+          url: "http://hellacompany.com/"
+        };
+        $scope.data = {
+          content: {
+            view: "Native In App",
+            url: "http://hellacompany.com/"
+          }
+        };
+        $scope.url = $sce.trustAsResourceUrl(content.url);
+        if (!$scope.$$phase && !$scope.$root.$$phase) {
+          $scope.$apply();
+        }
       }
     }
 
