Commit f331f6671f92b3fce51bcf0ebe5b0d72e4cbf028
Merge branch 'blackcolorpaint' into Develop
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 | @@ -880,8 +880,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 880 | 880 | ||
| 881 | $rootScope.switchCanvas(); | 881 | $rootScope.switchCanvas(); |
| 882 | } | 882 | } |
| 883 | - else if ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)") | ||
| 884 | - { | 883 | + else if (($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "transparent") || ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)")) { |
| 885 | // 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 | 884 | // 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 |
| 886 | 885 | ||
| 887 | $rootScope.switchCanvas(); | 886 | $rootScope.switchCanvas(); |