ADAM / AIAHTML5

Commit ddf46880def8d691f2dd90caa4921a670effe009

Authored by Nikita Kulshreshtha
2 parents 0767c7a4 738debc2

Merge branch 'AnnotationDefaultColorIssue' into Develop

Inline Side-by-side
Showing 2 changed files with 24 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ddf4688
... ... @@ -6824,7 +6824,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6824 6824  
6825 6825 $("#text_area").val('');
6826 6826 $("#text_area").css({ " font-family": "'Verdana, sans-serif'", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
6827   -
  6827 + $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
  6828 + // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
6828 6829  
6829 6830 $("#text-italic").removeClass("ActiveFormattingButtonClass");
6830 6831  
... ... @@ -6873,7 +6874,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6873 6874  
6874 6875 $("#annotationTextModal").modal("toggle");
6875 6876 $('.btnCursor').trigger('click');
6876   -
  6877 + $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
  6878 + // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
6877 6879 $("#text_area").val('');
6878 6880  
6879 6881 $("#text_area").css({ " font-family": 'Verdana, sans-serif', "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
... ... @@ -7035,8 +7037,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7035 7037 $("#text_area").css("color", $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontColor);
7036 7038 $("#text_area").css("font-family", $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontFamily);
7037 7039 $("#text_area").css("text-decoration", $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].TextDecoration);
7038   -
7039   -
  7040 + $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontColor });
  7041 + // $(".ActiveDefaultColorAnnotation").css({ "background-color": $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontColor + "!important" });
  7042 + // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
7040 7043  
7041 7044  
7042 7045 //adding text text decoration active class in text edit pop-up
... ... @@ -7156,7 +7159,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7156 7159 $("#text_area").val('');
7157 7160 $("#text_area").css({ " font-family": "'Verdana, sans-serif'", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
7158 7161  
7159   -
  7162 + $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
7160 7163 $("#text-italic").removeClass("ActiveFormattingButtonClass");
7161 7164  
7162 7165 $("#text-bold").removeClass("ActiveFormattingButtonClass");
... ... @@ -7279,8 +7282,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7279 7282 $("#text_area").css("color", _modifiedFontColor);
7280 7283 $("#text_area").css("font-family", _modifiedFontFamily);
7281 7284 $("#text_area").css("text-decoration", _modifiedFontDecoration);
7282   -
7283   -
  7285 + $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": _modifiedFontColor });
  7286 + // $(".ActiveDefaultColorAnnotation").css({ "background-color": _modifiedFontColor + "!important" });
  7287 + // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
7284 7288  
7285 7289 //adding text text decoration active class in text edit pop-up
7286 7290 if (_modifiedFontDecoration == "underline") {
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @ddf4688
... ... @@ -42,7 +42,9 @@
42 42 <!--Annotation Toolbar: Jcanvas-->
43 43 <style>
44 44  
45   -
  45 + /*.ActiveDefaultColorAnnotation {
  46 + background-color: #000000!important;
  47 + }*/
46 48 .ActiveFormattingButtonClass {
47 49 background-color: #1B92D0 !important;
48 50 }
... ... @@ -1199,12 +1201,14 @@
1199 1201 <script type="text/javascript">
1200 1202 $(function () {
1201 1203 var colpick = $('.demo').each(function () {
  1204 +
1202 1205 $(this).minicolors({
1203 1206 control: $(this).attr('data-control') || 'hue',
1204 1207 inline: $(this).attr('data-inline') === 'true',
1205 1208 letterCase: 'lowercase',
1206 1209 opacity: false,
1207 1210 change: function (hex, opacity) {
  1211 + $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").removeClass("ActiveDefaultColorAnnotation");
1208 1212 if (!hex) return;
1209 1213 if (opacity) hex += ', ' + opacity;
1210 1214 try {
... ... @@ -1338,6 +1342,8 @@
1338 1342  
1339 1343 <script>
1340 1344 $(document).ready(function () {
  1345 + // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
  1346 + $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
1341 1347 var borderWidth = 1;
1342 1348 var borderColor = "#000";
1343 1349 $("#borderWidthCanvasElement").change(function () {
... ... @@ -1353,9 +1359,10 @@
1353 1359 }
1354 1360 });
1355 1361  
  1362 +
1356 1363  
1357 1364 $('.borderColorCanvasPreview').each(function () {
1358   -
  1365 + // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
1359 1366 $(this).minicolors({
1360 1367 control: $(this).attr('data-control') || 'hue',
1361 1368 defaultValue: $(this).attr('data-defaultValue') || '',
... ... @@ -1371,8 +1378,8 @@
1371 1378 if (opacity) value += ', ' + opacity;
1372 1379 if (typeof console === 'object') {
1373 1380 console.log(value);
1374   -
1375   - borderColor = value;
  1381 +
  1382 + borderColor = value;
1376 1383 $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor);
1377 1384  
1378 1385  
... ... @@ -1381,12 +1388,12 @@
1381 1388 theme: 'bootstrap'
1382 1389 });
1383 1390  
  1391 +
1384 1392 });
1385 1393  
1386 1394  
1387   -
1388 1395 $('.outerBackgroundColor').each(function () {
1389   -
  1396 +
1390 1397 $(this).minicolors({
1391 1398 control: $(this).attr('data-control') || 'hue',
1392 1399 defaultValue: $(this).attr('data-defaultValue') || '',
... ...