Merge branch 'blackcolorpaint' into Develop

Nikita Kulshreshtha
2 parents 1e33dc8e e52f1d24
Showing 1 changed file with 1 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -880,8 +880,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
  
                 $rootScope.switchCanvas();
             }
-            else if ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)")
-            {
+            else if (($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "transparent") || ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)")) {
                 // we are switching canvas from paint to draw to prevent paint because it does not take transparent color and we need control default black color for the case where user has unchecked fill option from Edit Shape Style window
  
                 $rootScope.switchCanvas();