Commit 2abe4bf551b0d055204a8f76e0a64a3bc77e9c0f
1 parent
cc9a55cf
Changed Naming
Showing
3 changed files
with
92 additions
and
184 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -149,7 +149,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -149,7 +149,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
| 149 | //theme:"rounded" | 149 | //theme:"rounded" |
| 150 | }); | 150 | }); |
| 151 | } | 151 | } |
| 152 | - $rootScope.fontCounter = 0; | 152 | + $rootScope.isFontFamilyLoaded = true; |
| 153 | //annotation tool custom events | 153 | //annotation tool custom events |
| 154 | $rootScope.ShowAnnotationWindow = function () { | 154 | $rootScope.ShowAnnotationWindow = function () { |
| 155 | //7904 | 155 | //7904 |
| @@ -164,19 +164,19 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -164,19 +164,19 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
| 164 | $("#canvasPaint").css("display", "none"); | 164 | $("#canvasPaint").css("display", "none"); |
| 165 | $("#canvas").css("display", "none"); | 165 | $("#canvas").css("display", "none"); |
| 166 | 166 | ||
| 167 | - var bodySystemDataPath = '~/../content/data/json/settings/fontstyle.json'; | ||
| 168 | - DataService.getJson(bodySystemDataPath) | 167 | + var FontFamilyJson = '~/../content/data/json/settings/fontstyle.json'; |
| 168 | + DataService.getJson(FontFamilyJson) | ||
| 169 | .then( | 169 | .then( |
| 170 | function (result) { | 170 | function (result) { |
| 171 | 171 | ||
| 172 | $rootScope.AnnotationFontFamily = result; | 172 | $rootScope.AnnotationFontFamily = result; |
| 173 | // alert($rootScope.AnnotationFontFamily.FontStyle.length); | 173 | // alert($rootScope.AnnotationFontFamily.FontStyle.length); |
| 174 | - if ($rootScope.fontCounter == 0) | ||
| 175 | - for(var i=0;i<=$rootScope.AnnotationFontFamily.FontStyle.length-1;i++) | 174 | + if ($rootScope.isFontFamilyLoaded == true) |
| 175 | + for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) | ||
| 176 | { | 176 | { |
| 177 | 177 | ||
| 178 | - $("#selected-font-family").append("<option>" + $rootScope.AnnotationFontFamily.FontStyle[i].FontFamily + "</option>"); | ||
| 179 | - $rootScope.fontCounter = 1; | 178 | + $("#selected-font-family").append("<option>" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>"); |
| 179 | + $rootScope.isFontFamilyLoaded = false; | ||
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | }, | 182 | }, |
400-SOURCECODE/AIAHTML5.Web/content/data/json/settings/fontstyle.json
| 1 | { | 1 | { |
| 2 | -"FontStyle":[ | 2 | +"FontFamily":[ |
| 3 | { | 3 | { |
| 4 | -"FontFamily": "Arial" | 4 | +"FontName": "Arial" |
| 5 | }, | 5 | }, |
| 6 | { | 6 | { |
| 7 | -"FontFamily": "Agency FB" | 7 | +"FontName": "Agency FB" |
| 8 | },{ | 8 | },{ |
| 9 | -"FontFamily": "Arial Narrow" | 9 | +"FontName": "Arial Narrow" |
| 10 | },{ | 10 | },{ |
| 11 | -"FontFamily": "Arial Rounded" | 11 | +"FontName": "Arial Rounded" |
| 12 | },{ | 12 | },{ |
| 13 | -"FontFamily": "Arial TUR" | 13 | +"FontName": "Arial TUR" |
| 14 | },{ | 14 | },{ |
| 15 | -"FontFamily": "Arial Unicode" | 15 | +"FontName": "Arial Unicode" |
| 16 | },{ | 16 | },{ |
| 17 | -"FontFamily": "Articulate" | 17 | +"FontName": "Articulate" |
| 18 | },{ | 18 | },{ |
| 19 | -"FontFamily": "Bell MT" | 19 | +"FontName": "Bell MT" |
| 20 | },{ | 20 | },{ |
| 21 | -"FontFamily": "Berlin Sans" | 21 | +"FontName": "Berlin Sans" |
| 22 | },{ | 22 | },{ |
| 23 | -"FontFamily": "Bemard MT" | 23 | +"FontName": "Bemard MT" |
| 24 | },{ | 24 | },{ |
| 25 | -"FontFamily": "Bodoni MT" | 25 | +"FontName": "Bodoni MT" |
| 26 | },{ | 26 | },{ |
| 27 | -"FontFamily": "Broadway" | 27 | +"FontName": "Broadway" |
| 28 | },{ | 28 | },{ |
| 29 | -"FontFamily": "Caladea" | 29 | +"FontName": "Caladea" |
| 30 | },{ | 30 | },{ |
| 31 | -"FontFamily": "Calibri" | 31 | +"FontName": "Calibri" |
| 32 | },{ | 32 | },{ |
| 33 | -"FontFamily": "Calibri Light" | 33 | +"FontName": "Calibri Light" |
| 34 | },{ | 34 | },{ |
| 35 | -"FontFamily": "Calisto MT" | 35 | +"FontName": "Calisto MT" |
| 36 | },{ | 36 | },{ |
| 37 | -"FontFamily": "Cambria" | 37 | +"FontName": "Cambria" |
| 38 | },{ | 38 | },{ |
| 39 | -"FontFamily": "Candara" | 39 | +"FontName": "Candara" |
| 40 | },{ | 40 | },{ |
| 41 | -"FontFamily": "Carlito" | 41 | +"FontName": "Carlito" |
| 42 | },{ | 42 | },{ |
| 43 | -"FontFamily": "Castellar" | 43 | +"FontName": "Castellar" |
| 44 | },{ | 44 | },{ |
| 45 | -"FontFamily": "Centaur" | 45 | +"FontName": "Centaur" |
| 46 | },{ | 46 | },{ |
| 47 | -"FontFamily": "Century" | 47 | +"FontName": "Century" |
| 48 | },{ | 48 | },{ |
| 49 | -"FontFamily": "Chiller" | 49 | +"FontName": "Chiller" |
| 50 | },{ | 50 | },{ |
| 51 | -"FontFamily": "Colonna MT" | 51 | +"FontName": "Colonna MT" |
| 52 | },{ | 52 | },{ |
| 53 | -"FontFamily": "Comic Sans" | 53 | +"FontName": "Comic Sans" |
| 54 | },{ | 54 | },{ |
| 55 | -"FontFamily": "Consolas" | 55 | +"FontName": "Consolas" |
| 56 | },{ | 56 | },{ |
| 57 | -"FontFamily": "Constantia" | 57 | +"FontName": "Constantia" |
| 58 | },{ | 58 | },{ |
| 59 | -"FontFamily": "Curlz MT" | 59 | +"FontName": "Curlz MT" |
| 60 | },{ | 60 | },{ |
| 61 | -"FontFamily": "Ebrima" | 61 | +"FontName": "Ebrima" |
| 62 | },{ | 62 | },{ |
| 63 | -"FontFamily": "Elephant" | 63 | +"FontName": "Elephant" |
| 64 | },{ | 64 | },{ |
| 65 | -"FontFamily": "Felix Titling" | 65 | +"FontName": "Felix Titling" |
| 66 | },{ | 66 | },{ |
| 67 | -"FontFamily": "Forte" | 67 | +"FontName": "Forte" |
| 68 | },{ | 68 | },{ |
| 69 | -"FontFamily": "Gabriola" | 69 | +"FontName": "Gabriola" |
| 70 | },{ | 70 | },{ |
| 71 | -"FontFamily": "Gadugi" | 71 | +"FontName": "Gadugi" |
| 72 | },{ | 72 | },{ |
| 73 | -"FontFamily": "Garamond" | 73 | +"FontName": "Garamond" |
| 74 | },{ | 74 | },{ |
| 75 | -"FontFamily": "Georgia" | 75 | +"FontName": "Georgia" |
| 76 | },{ | 76 | },{ |
| 77 | -"FontFamily": "Harrington" | 77 | +"FontName": "Harrington" |
| 78 | },{ | 78 | },{ |
| 79 | -"FontFamily": "Helvetica" | 79 | +"FontName": "Helvetica" |
| 80 | },{ | 80 | },{ |
| 81 | -"FontFamily": "Impact" | 81 | +"FontName": "Impact" |
| 82 | },{ | 82 | },{ |
| 83 | -"FontFamily": "Jokerman" | 83 | +"FontName": "Jokerman" |
| 84 | },{ | 84 | },{ |
| 85 | -"FontFamily": "Juice ITC" | 85 | +"FontName": "Juice ITC" |
| 86 | },{ | 86 | },{ |
| 87 | -"FontFamily": "Kristen ITC" | 87 | +"FontName": "Kristen ITC" |
| 88 | },{ | 88 | },{ |
| 89 | -"FontFamily": "Lucida Fax" | 89 | +"FontName": "Lucida Fax" |
| 90 | },{ | 90 | },{ |
| 91 | -"FontFamily": "Magneto" | 91 | +"FontName": "Magneto" |
| 92 | },{ | 92 | },{ |
| 93 | -"FontFamily": "Marlett" | 93 | +"FontName": "Marlett" |
| 94 | },{ | 94 | },{ |
| 95 | -"FontFamily": "Mistral" | 95 | +"FontName": "Mistral" |
| 96 | },{ | 96 | },{ |
| 97 | -"FontFamily": "MS Gothic" | 97 | +"FontName": "MS Gothic" |
| 98 | },{ | 98 | },{ |
| 99 | -"FontFamily": "MS Outlook" | 99 | +"FontName": "MS Outlook" |
| 100 | },{ | 100 | },{ |
| 101 | -"FontFamily": "MS PGothic" | 101 | +"FontName": "MS PGothic" |
| 102 | },{ | 102 | },{ |
| 103 | -"FontFamily": "MV Boli" | 103 | +"FontName": "MV Boli" |
| 104 | },{ | 104 | },{ |
| 105 | -"FontFamily": "Nirmala UI" | 105 | +"FontName": "Nirmala UI" |
| 106 | },{ | 106 | },{ |
| 107 | -"FontFamily": "NSimSun" | 107 | +"FontName": "NSimSun" |
| 108 | },{ | 108 | },{ |
| 109 | -"FontFamily": "Old English" | 109 | +"FontName": "Old English" |
| 110 | },{ | 110 | },{ |
| 111 | -"FontFamily": "Onyx" | 111 | +"FontName": "Onyx" |
| 112 | },{ | 112 | },{ |
| 113 | -"FontFamily": "Open Sans" | 113 | +"FontName": "Open Sans" |
| 114 | },{ | 114 | },{ |
| 115 | -"FontFamily": "Papyrus" | 115 | +"FontName": "Papyrus" |
| 116 | },{ | 116 | },{ |
| 117 | -"FontFamily": "Parchment" | 117 | +"FontName": "Parchment" |
| 118 | },{ | 118 | },{ |
| 119 | -"FontFamily": "Perpetua" | 119 | +"FontName": "Perpetua" |
| 120 | },{ | 120 | },{ |
| 121 | -"FontFamily": "Playbill" | 121 | +"FontName": "Playbill" |
| 122 | },{ | 122 | },{ |
| 123 | -"FontFamily": "Pristina" | 123 | +"FontName": "Pristina" |
| 124 | },{ | 124 | },{ |
| 125 | -"FontFamily": "PT Serif" | 125 | +"FontName": "PT Serif" |
| 126 | },{ | 126 | },{ |
| 127 | -"FontFamily": "Rage Italic" | 127 | +"FontName": "Rage Italic" |
| 128 | },{ | 128 | },{ |
| 129 | -"FontFamily": "Ravie" | 129 | +"FontName": "Ravie" |
| 130 | },{ | 130 | },{ |
| 131 | -"FontFamily": "Rockwell" | 131 | +"FontName": "Rockwell" |
| 132 | },{ | 132 | },{ |
| 133 | -"FontFamily": "Segoe Print" | 133 | +"FontName": "Segoe Print" |
| 134 | },{ | 134 | },{ |
| 135 | -"FontFamily": "Segoe UI" | 135 | +"FontName": "Segoe UI" |
| 136 | },{ | 136 | },{ |
| 137 | -"FontFamily": "SimSun" | 137 | +"FontName": "SimSun" |
| 138 | },{ | 138 | },{ |
| 139 | -"FontFamily": "Sitka Small" | 139 | +"FontName": "Sitka Small" |
| 140 | },{ | 140 | },{ |
| 141 | -"FontFamily": "Sitka Subhe" | 141 | +"FontName": "Sitka Subhe" |
| 142 | },{ | 142 | },{ |
| 143 | -"FontFamily": "Sitka Text" | 143 | +"FontName": "Sitka Text" |
| 144 | },{ | 144 | },{ |
| 145 | -"FontFamily": "SketchFlow" | 145 | +"FontName": "SketchFlow" |
| 146 | },{ | 146 | },{ |
| 147 | -"FontFamily": "Snap ITC" | 147 | +"FontName": "Snap ITC" |
| 148 | },{ | 148 | },{ |
| 149 | -"FontFamily": "Stencil" | 149 | +"FontName": "Stencil" |
| 150 | },{ | 150 | },{ |
| 151 | -"FontFamily": "Sylfaen" | 151 | +"FontName": "Sylfaen" |
| 152 | },{ | 152 | },{ |
| 153 | -"FontFamily": "Symbol" | 153 | +"FontName": "Symbol" |
| 154 | },{ | 154 | },{ |
| 155 | -"FontFamily": "Tahoma" | 155 | +"FontName": "Tahoma" |
| 156 | },{ | 156 | },{ |
| 157 | -"FontFamily": "Tw Cen MT" | 157 | +"FontName": "Tw Cen MT" |
| 158 | },{ | 158 | },{ |
| 159 | -"FontFamily": "Verdana" | 159 | +"FontName": "Verdana" |
| 160 | },{ | 160 | },{ |
| 161 | -"FontFamily": "Vivaldi" | 161 | +"FontName": "Vivaldi" |
| 162 | },{ | 162 | },{ |
| 163 | -"FontFamily": "Webdings" | 163 | +"FontName": "Webdings" |
| 164 | },{ | 164 | },{ |
| 165 | -"FontFamily": "Wide Latin" | 165 | +"FontName": "Wide Latin" |
| 166 | },{ | 166 | },{ |
| 167 | -"FontFamily": "Wingdings" | 167 | +"FontName": "Wingdings" |
| 168 | },{ | 168 | },{ |
| 169 | -"FontFamily": "Yu Gothic" | 169 | +"FontName": "Yu Gothic" |
| 170 | }] | 170 | }] |
| 171 | } | 171 | } |
400-SOURCECODE/AIAHTML5.Web/index.html
| @@ -549,99 +549,7 @@ | @@ -549,99 +549,7 @@ | ||
| 549 | <div class="form-inline"> | 549 | <div class="form-inline"> |
| 550 | <!--Annotation: Text in different font style is same.--> | 550 | <!--Annotation: Text in different font style is same.--> |
| 551 | <select class="form-control" id="selected-font-family"> | 551 | <select class="form-control" id="selected-font-family"> |
| 552 | - <!--<option ng-repeat="i in FontFamilyArray">{{i}}</option>--> | ||
| 553 | - <!--<option>Arial</option> | ||
| 554 | - <option>Agency FB</option> | ||
| 555 | - <option>Algerian</option> | ||
| 556 | - <option>Arabic Trans</option> | ||
| 557 | - <option>Arial Baltic</option> | ||
| 558 | - <option>Arial Black</option> | ||
| 559 | - <option>Arial CE</option> | ||
| 560 | - <option>Arial CYR</option> | ||
| 561 | - <option>Arial Greek</option> | ||
| 562 | - <option>Arial Narrow</option> | ||
| 563 | - <option>Arial Rounded</option> | ||
| 564 | - <option>Arial TUR</option> | ||
| 565 | - <option>Arial Unicode</option> | ||
| 566 | - <option>Articulate</option> | ||
| 567 | - <option>Bell MT</option> | ||
| 568 | - <option>Berlin Sans</option> | ||
| 569 | - <option>Bemard MT</option> | ||
| 570 | - <option>Bodoni MT</option> | ||
| 571 | - <option>Broadway</option> | ||
| 572 | - <option>Caladea</option> | ||
| 573 | - <option>Calibri</option> | ||
| 574 | - <option>Calibri Light</option> | ||
| 575 | - <option>Calisto MT</option> | ||
| 576 | - <option>Cambria</option> | ||
| 577 | - <option>Candara</option> | ||
| 578 | - <option>Carlito</option> | ||
| 579 | - <option>Castellar</option> | ||
| 580 | - <option>Centaur</option> | ||
| 581 | - <option>Century</option> | ||
| 582 | - <option>Chiller</option> | ||
| 583 | - <option>Colonna MT</option> | ||
| 584 | - <option>Comic Sans</option> | ||
| 585 | - <option>Consolas</option> | ||
| 586 | - <option>Constantia</option> | ||
| 587 | - <option>Constantia</option> | ||
| 588 | - <option>Curlz MT</option> | ||
| 589 | - <option>Ebrima</option> | ||
| 590 | - <option>Elephant</option> | ||
| 591 | - <option>Felix Titling</option> | ||
| 592 | - <option>Forte</option> | ||
| 593 | - <option>Gabriola</option> | ||
| 594 | - <option>Gadugi</option> | ||
| 595 | - <option>Garamond</option> | ||
| 596 | - <option>Georgia</option> | ||
| 597 | - <option>Georgia</option> | ||
| 598 | - <option>Harrington</option> | ||
| 599 | - <option>Helvetica</option> | ||
| 600 | - <option>Impact</option> | ||
| 601 | - <option>Jokerman</option> | ||
| 602 | - <option>Juice ITC</option> | ||
| 603 | - <option>Kristen ITC</option> | ||
| 604 | - <option>Lucida Fax</option> | ||
| 605 | - <option>Magneto</option> | ||
| 606 | - <option>Marlett</option> | ||
| 607 | - <option>Mistral</option> | ||
| 608 | - <option>MS Gothic</option> | ||
| 609 | - <option>MS Outlook</option> | ||
| 610 | - <option>MS PGothic</option> | ||
| 611 | - <option>MV Boli</option> | ||
| 612 | - <option>Nirmala UI</option> | ||
| 613 | - <option>NSimSun</option> | ||
| 614 | - <option>Old English</option> | ||
| 615 | - <option>Onyx</option> | ||
| 616 | - <option>Open Sans</option> | ||
| 617 | - <option>Papyrus</option> | ||
| 618 | - <option>Parchment</option> | ||
| 619 | - <option>Perpetua</option> | ||
| 620 | - <option>Playbill</option> | ||
| 621 | - <option>Pristina</option> | ||
| 622 | - <option>PT Serif</option> | ||
| 623 | - <option>Rage Italic</option> | ||
| 624 | - <option>Ravie</option> | ||
| 625 | - <option>Rockwell</option> | ||
| 626 | - <option>Segoe Print</option> | ||
| 627 | - <option>Segoe UI</option> | ||
| 628 | - <option>SimSun</option> | ||
| 629 | - <option>Sitka Small</option> | ||
| 630 | - <option>Sitka Subhe</option> | ||
| 631 | - <option>Sitka Text</option> | ||
| 632 | - <option>SketchFlow</option> | ||
| 633 | - <option>Snap ITC</option> | ||
| 634 | - <option>Stencil</option> | ||
| 635 | - <option>Sylfaen</option> | ||
| 636 | - <option>Symbol</option> | ||
| 637 | - <option>Tahoma</option> | ||
| 638 | - <option>Tw Cen MT</option> | ||
| 639 | - <option>Verdana</option> | ||
| 640 | - <option>Vivaldi</option> | ||
| 641 | - <option>Webdings</option> | ||
| 642 | - <option>Wide Latin</option> | ||
| 643 | - <option>Wingdings</option> | ||
| 644 | - <option>Yu Gothic</option>--> | 552 | + |
| 645 | </select> | 553 | </select> |
| 646 | <select class="form-control" id="selected-font-size"> | 554 | <select class="form-control" id="selected-font-size"> |
| 647 | <option>14</option> | 555 | <option>14</option> |