Merge pull request #28 from adyNabeelMadain/hotFix1

DanielHindi · DanielHindi · commit 66083916e553 · 2016-01-28T13:36:25.000-08:00
default custom colors
diff --git a/control/design/index.html b/control/design/index.html
@@ -16,7 +16,7 @@
     <script src="../../js/ui-bootstrap.min.js"></script>
     <script src="../../js/angular-color-picker.js"></script>
     <script src="../../js/shared.js"></script>
-
+    <script type="text/javascript" src="/app/scripts/framework/pluginAPI/datastoreAPI.js"></script>
 </head>
 <body ng-controller="folderPluginCtrl" ng-cloak ng-show="datastoreInitialized">
 <div ng-form="frmMain">
@@ -117,17 +117,17 @@
         </div>
         <div class="main col-md-9 pull-right">
             <div class="radio radio-primary radio-inline">
-                <input id="appearance" type="radio" name="colorType" ng-checked="colorType=='A'" ng-click="setColorType('A')"/>
+                <input id="appearance" type="radio" name="colorType" ng-checked="data.design.colorType=='A'" ng-click="setColorType('A')"/>
                 <label for="appearance">Inherit Appearance Theme</label>
             </div>
             <div class="radio radio-primary radio-inline">
-                <input id="customColor" type="radio" name="colorType" ng-checked="colorType=='C'" ng-click="setColorType('C')"/>
+                <input id="customColor" type="radio" name="colorType" ng-checked="data.design.colorType=='C'" ng-click="setColorType('C')"/>
                 <label for="customColor">Custom Theme</label>
             </div>
         </div>
     </div>
     <hr class="none">
-    <div class="item clearfix row margin-bottom-twenty" ng-if="colorType=='C'">
+    <div class="item clearfix row margin-bottom-twenty" ng-if="data.design.colorType=='C'">
         <div class="main col-md-9 pull-right">
             <div class="colorgrid pull-left">
                 <div class="colorgrid pull-left row">
@@ -151,9 +151,9 @@
 
     folderPluginApp.controller('folderPluginCtrl', ['$scope', '$window', function ($scope, $window) {
         $scope.defaultColors = {
-            "backgroundColor": "",
-            "bodyText": "",
-            "icons": ""
+            "backgroundColor": "#FFFFFF",
+            "bodyText": "#32373a",
+            "icons": "#09a3ee"
         };
 
         $scope.availableLayouts = folderPluginShared.getLayouts();
@@ -191,7 +191,7 @@
                         backgroundImage: {},
                         selectedLayout: 1,
                         backgroundblur: 0,
-                        colors: {}
+                        colorType: 'A'
                     };
                 }
                 else {
@@ -204,9 +204,9 @@
             }
 
             $scope.data.design = $scope.data.design || {};
-            $scope.data.design.colors = $scope.data.design.colors || {};
-
-            $scope.colorType = angular.equals({}, $scope.data.design.colors) ? "A" : "C";
+            if (!$scope.data.design.colorType) {
+                $scope.data.design.colorType = "A";
+            }
 
             /*
              * watch for changes in data and trigger the saveData function on change
@@ -317,9 +317,11 @@
         };
 
         $scope.setColorType = function (colorType) {
-            if ($scope.colorType === colorType) return;
-            $scope.colorType = colorType;
-            $scope.data.design.colors = {};
+            if ($scope.data.design.colorType === colorType) return;
+            $scope.data.design.colorType = colorType;
+            if ($scope.data.design.colorType === "C" && !$scope.data.design.colors) {
+                $scope.data.design.colors = $scope.defaultColors;
+            }
         };
 
         angular.element($window).bind('mousedown', function () {
diff --git a/js/shared.js b/js/shared.js
@@ -43,7 +43,8 @@ folderPluginShared.getDefaultScopeData = function () {
             backgroundImage: null,
             logoImage: null,
             selectedLayout: 1,
-            backgroundblur: 0
+            backgroundblur: 0,
+            colorType: 'A'
         }
     };
 };
diff --git a/widget/index.html b/widget/index.html
@@ -22,17 +22,17 @@
 <body ng-cloak class="gridLayout" ng-controller="folderPluginCtrl">
 <style>
     body.gridLayout {
-    background-color: {{data.design.colors.backgroundColor}} !important;
-    background-image: url({{backgroundImage}}) !important;
-    background-size: cover !important;
+        background-color: {{data.design.colorType === 'C' && data.design.colors.backgroundColor}} !important;
+        background-image: url({{backgroundImage}}) !important;
+        background-size: cover !important;
     }
 
     div.text-holder p {
-    color: {{data.design.colors.bodyText}} !important;
+        color: {{data.design.colorType === 'C' && data.design.colors.bodyText}} !important;
     }
 
     .icon, .glyphicon, .icon:hover {
-    color: {{data.design.colors.icons}} !important;
+        color: {{data.design.colorType === 'C' && data.design.colors.icons}} !important;
     }
 </style>
 <div class="holder padding-zero">
