Commit 7cbab50f2f007d1c2685ca89263f508c0858e602
Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into ipadIssue
Showing
1 changed file
with
8 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -997,8 +997,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -997,8 +997,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 997 | // alert($rootScope.AnnotationFontFamily.FontStyle.length); | 997 | // alert($rootScope.AnnotationFontFamily.FontStyle.length); |
| 998 | 998 | ||
| 999 | for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) { | 999 | for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) { |
| 1000 | - | ||
| 1001 | - $("#selected-font-family").append("<option value=" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>"); | 1000 | + var fontName = $rootScope.AnnotationFontFamily.FontFamily[i].FontName; |
| 1001 | + if (/\s/g.test(fontName)) { //Check if white-space exists in between strings | ||
| 1002 | + fontName = fontName.replace(" ", "_"); // replace white-space with an underscore | ||
| 1003 | + } | ||
| 1004 | + //$rootScope.AnnotationFontFamily.FontFamily[i].FontName | ||
| 1005 | + $("#selected-font-family").append("<option value=" + fontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>"); | ||
| 1002 | 1006 | ||
| 1003 | } | 1007 | } |
| 1004 | $rootScope.isFontFamilyLoaded = true; | 1008 | $rootScope.isFontFamilyLoaded = true; |
| @@ -3041,7 +3045,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -3041,7 +3045,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 3041 | $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[i].FontColor }); | 3045 | $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[i].FontColor }); |
| 3042 | 3046 | ||
| 3043 | var CurrentFontFamily = $rootScope.TextPropertyArray[i].FontFamily; | 3047 | var CurrentFontFamily = $rootScope.TextPropertyArray[i].FontFamily; |
| 3044 | - // alert(CurrentFontFamily); | 3048 | + // alert(CurrentFontFamily); |
| 3045 | // CurrentFontFamily = CurrentFontFamily.replace(/'/g, ""); | 3049 | // CurrentFontFamily = CurrentFontFamily.replace(/'/g, ""); |
| 3046 | var CurrentFontSize = parseInt($rootScope.TextPropertyArray[i].FontSize); | 3050 | var CurrentFontSize = parseInt($rootScope.TextPropertyArray[i].FontSize); |
| 3047 | $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true); | 3051 | $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true); |
| @@ -3668,6 +3672,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -3668,6 +3672,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
| 3668 | $rootScope.closeModal = function () { | 3672 | $rootScope.closeModal = function () { |
| 3669 | 3673 | ||
| 3670 | document.getElementById('modelbackground').style.display = "none"; | 3674 | document.getElementById('modelbackground').style.display = "none"; |
| 3675 | + $("#drawTextBGColorpicker span.minicolors-swatch-color").css('background-color', $rootScope.selectedBGColorForTextArea); | ||
| 3671 | 3676 | ||
| 3672 | } | 3677 | } |
| 3673 | //-- End ---------------------------- | 3678 | //-- End ---------------------------- |