From 2abe4bf551b0d055204a8f76e0a64a3bc77e9c0f Mon Sep 17 00:00:00 2001
From: unknown <Ayush.Jain@NOIAYJAALL.indiaebix.com>
Date: Thu, 20 Oct 2016 12:40:22 +0530
Subject: [PATCH] Changed Naming

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js         |  14 +++++++-------
 400-SOURCECODE/AIAHTML5.Web/content/data/json/settings/fontstyle.json | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------
 400-SOURCECODE/AIAHTML5.Web/index.html                                |  94 +---------------------------------------------------------------------------------------------
 3 files changed, 92 insertions(+), 184 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index e90ce05..61eb3a2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -149,7 +149,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 //theme:"rounded"
             });
         }
-        $rootScope.fontCounter = 0;
+        $rootScope.isFontFamilyLoaded = true;
         //annotation tool custom events
         $rootScope.ShowAnnotationWindow = function () {
             //7904
@@ -164,19 +164,19 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $("#canvasPaint").css("display", "none");
             $("#canvas").css("display", "none");
            
-            var bodySystemDataPath = '~/../content/data/json/settings/fontstyle.json';
-            DataService.getJson(bodySystemDataPath)
+            var FontFamilyJson = '~/../content/data/json/settings/fontstyle.json';
+            DataService.getJson(FontFamilyJson)
            .then(
             function (result) {
 
                 $rootScope.AnnotationFontFamily = result;
                // alert($rootScope.AnnotationFontFamily.FontStyle.length);
-                if ($rootScope.fontCounter == 0)
-                for(var i=0;i<=$rootScope.AnnotationFontFamily.FontStyle.length-1;i++)
+                if ($rootScope.isFontFamilyLoaded == true)
+                    for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++)
                 {
                
-                    $("#selected-font-family").append("<option>" + $rootScope.AnnotationFontFamily.FontStyle[i].FontFamily + "</option>");
-                    $rootScope.fontCounter = 1;
+                        $("#selected-font-family").append("<option>" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
+                    $rootScope.isFontFamilyLoaded = false;
                 }
              
             },
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/data/json/settings/fontstyle.json b/400-SOURCECODE/AIAHTML5.Web/content/data/json/settings/fontstyle.json
index 432217e..3d22eaa 100644
--- a/400-SOURCECODE/AIAHTML5.Web/content/data/json/settings/fontstyle.json
+++ b/400-SOURCECODE/AIAHTML5.Web/content/data/json/settings/fontstyle.json
@@ -1,171 +1,171 @@
 {
-"FontStyle":[
+"FontFamily":[
 {
-"FontFamily": "Arial"
+"FontName": "Arial"
 },
 {
-"FontFamily": "Agency FB"
+"FontName": "Agency FB"
 },{
-"FontFamily": "Arial Narrow"
+"FontName": "Arial Narrow"
 },{
-"FontFamily": "Arial Rounded"
+"FontName": "Arial Rounded"
 },{
-"FontFamily": "Arial TUR"
+"FontName": "Arial TUR"
 },{
-"FontFamily": "Arial Unicode"
+"FontName": "Arial Unicode"
 },{
-"FontFamily": "Articulate"
+"FontName": "Articulate"
 },{
-"FontFamily": "Bell MT"
+"FontName": "Bell MT"
 },{
-"FontFamily": "Berlin Sans"
+"FontName": "Berlin Sans"
 },{
-"FontFamily": "Bemard MT"
+"FontName": "Bemard MT"
 },{
-"FontFamily": "Bodoni MT"
+"FontName": "Bodoni MT"
 },{
-"FontFamily": "Broadway"
+"FontName": "Broadway"
 },{
-"FontFamily": "Caladea"
+"FontName": "Caladea"
 },{
-"FontFamily": "Calibri"
+"FontName": "Calibri"
 },{
-"FontFamily": "Calibri Light"
+"FontName": "Calibri Light"
 },{
-"FontFamily": "Calisto MT"
+"FontName": "Calisto MT"
 },{
-"FontFamily": "Cambria"
+"FontName": "Cambria"
 },{
-"FontFamily": "Candara"
+"FontName": "Candara"
 },{
-"FontFamily": "Carlito"
+"FontName": "Carlito"
 },{
-"FontFamily": "Castellar"
+"FontName": "Castellar"
 },{
-"FontFamily": "Centaur"
+"FontName": "Centaur"
 },{
-"FontFamily": "Century"
+"FontName": "Century"
 },{
-"FontFamily": "Chiller"
+"FontName": "Chiller"
 },{
-"FontFamily": "Colonna MT"
+"FontName": "Colonna MT"
 },{
-"FontFamily": "Comic Sans"
+"FontName": "Comic Sans"
 },{
-"FontFamily": "Consolas"
+"FontName": "Consolas"
 },{
-"FontFamily": "Constantia"
+"FontName": "Constantia"
 },{
-"FontFamily": "Curlz MT"
+"FontName": "Curlz MT"
 },{
-"FontFamily": "Ebrima"
+"FontName": "Ebrima"
 },{
-"FontFamily": "Elephant"
+"FontName": "Elephant"
 },{
-"FontFamily": "Felix Titling"
+"FontName": "Felix Titling"
 },{
-"FontFamily": "Forte"
+"FontName": "Forte"
 },{
-"FontFamily": "Gabriola"
+"FontName": "Gabriola"
 },{
-"FontFamily": "Gadugi"
+"FontName": "Gadugi"
 },{
-"FontFamily": "Garamond"
+"FontName": "Garamond"
 },{
-"FontFamily": "Georgia"
+"FontName": "Georgia"
 },{
-"FontFamily": "Harrington"
+"FontName": "Harrington"
 },{
-"FontFamily": "Helvetica"
+"FontName": "Helvetica"
 },{
-"FontFamily": "Impact"
+"FontName": "Impact"
 },{
-"FontFamily": "Jokerman"
+"FontName": "Jokerman"
 },{
-"FontFamily": "Juice ITC"
+"FontName": "Juice ITC"
 },{
-"FontFamily": "Kristen ITC"
+"FontName": "Kristen ITC"
 },{
-"FontFamily": "Lucida Fax"
+"FontName": "Lucida Fax"
 },{
-"FontFamily": "Magneto"
+"FontName": "Magneto"
 },{
-"FontFamily": "Marlett"
+"FontName": "Marlett"
 },{
-"FontFamily": "Mistral"
+"FontName": "Mistral"
 },{
-"FontFamily": "MS Gothic"
+"FontName": "MS Gothic"
 },{
-"FontFamily": "MS Outlook"
+"FontName": "MS Outlook"
 },{
-"FontFamily": "MS PGothic"
+"FontName": "MS PGothic"
 },{
-"FontFamily": "MV Boli"
+"FontName": "MV Boli"
 },{
-"FontFamily": "Nirmala UI"
+"FontName": "Nirmala UI"
 },{
-"FontFamily": "NSimSun"
+"FontName": "NSimSun"
 },{
-"FontFamily": "Old English"
+"FontName": "Old English"
 },{
-"FontFamily": "Onyx"
+"FontName": "Onyx"
 },{
-"FontFamily": "Open Sans"
+"FontName": "Open Sans"
 },{
-"FontFamily": "Papyrus"
+"FontName": "Papyrus"
 },{
-"FontFamily": "Parchment"
+"FontName": "Parchment"
 },{
-"FontFamily": "Perpetua"
+"FontName": "Perpetua"
 },{
-"FontFamily": "Playbill"
+"FontName": "Playbill"
 },{
-"FontFamily": "Pristina"
+"FontName": "Pristina"
 },{
-"FontFamily": "PT Serif"
+"FontName": "PT Serif"
 },{
-"FontFamily": "Rage Italic"
+"FontName": "Rage Italic"
 },{
-"FontFamily": "Ravie"
+"FontName": "Ravie"
 },{
-"FontFamily": "Rockwell"
+"FontName": "Rockwell"
 },{
-"FontFamily": "Segoe Print"
+"FontName": "Segoe Print"
 },{
-"FontFamily": "Segoe UI"
+"FontName": "Segoe UI"
 },{
-"FontFamily": "SimSun"
+"FontName": "SimSun"
 },{
-"FontFamily": "Sitka Small"
+"FontName": "Sitka Small"
 },{
-"FontFamily": "Sitka Subhe"
+"FontName": "Sitka Subhe"
 },{
-"FontFamily": "Sitka Text"
+"FontName": "Sitka Text"
 },{
-"FontFamily": "SketchFlow"
+"FontName": "SketchFlow"
 },{
-"FontFamily": "Snap ITC"
+"FontName": "Snap ITC"
 },{
-"FontFamily": "Stencil"
+"FontName": "Stencil"
 },{
-"FontFamily": "Sylfaen"
+"FontName": "Sylfaen"
 },{
-"FontFamily": "Symbol"
+"FontName": "Symbol"
 },{
-"FontFamily": "Tahoma"
+"FontName": "Tahoma"
 },{
-"FontFamily": "Tw Cen MT"
+"FontName": "Tw Cen MT"
 },{
-"FontFamily": "Verdana"
+"FontName": "Verdana"
 },{
-"FontFamily": "Vivaldi"
+"FontName": "Vivaldi"
 },{
-"FontFamily": "Webdings"
+"FontName": "Webdings"
 },{
-"FontFamily": "Wide Latin"
+"FontName": "Wide Latin"
 },{
-"FontFamily": "Wingdings"
+"FontName": "Wingdings"
 },{
-"FontFamily": "Yu Gothic"
+"FontName": "Yu Gothic"
 }]
 }
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index e699f6e..aa48dd8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -549,99 +549,7 @@
                         <div class="form-inline">
                             <!--Annotation: Text in different font style is same.-->
                             <select class="form-control" id="selected-font-family">
-                                <!--<option ng-repeat="i in FontFamilyArray">{{i}}</option>-->
-                                 <!--<option>Arial</option>
-                                <option>Agency FB</option>
-                                <option>Algerian</option>
-                                <option>Arabic Trans</option>
-                                <option>Arial Baltic</option>
-                                <option>Arial Black</option>
-                                <option>Arial CE</option>
-                                <option>Arial CYR</option>
-                                <option>Arial Greek</option>
-                                <option>Arial Narrow</option>
-                                <option>Arial Rounded</option>
-                                <option>Arial TUR</option>
-                                <option>Arial Unicode</option>
-                                <option>Articulate</option>
-                                <option>Bell MT</option>
-                                <option>Berlin Sans</option>
-                                <option>Bemard MT</option>
-                                <option>Bodoni MT</option>
-                                <option>Broadway</option>
-                                <option>Caladea</option>
-                                <option>Calibri</option>
-                                <option>Calibri Light</option>
-                                <option>Calisto MT</option>
-                                <option>Cambria</option>
-                                <option>Candara</option>
-                                <option>Carlito</option>
-                                <option>Castellar</option>
-                                <option>Centaur</option>
-                                <option>Century</option>
-                                <option>Chiller</option>
-                                <option>Colonna MT</option>
-                                <option>Comic Sans</option>
-                                <option>Consolas</option>
-                                <option>Constantia</option>
-                                <option>Constantia</option>
-                                <option>Curlz MT</option>
-                                <option>Ebrima</option>
-                                <option>Elephant</option>
-                                <option>Felix Titling</option>
-                                <option>Forte</option>
-                                <option>Gabriola</option>
-                                <option>Gadugi</option>
-                                <option>Garamond</option>
-                                <option>Georgia</option>
-                                <option>Georgia</option>
-                                <option>Harrington</option>
-                                <option>Helvetica</option>
-                                <option>Impact</option>
-                                <option>Jokerman</option>
-                                <option>Juice ITC</option>
-                                <option>Kristen ITC</option>
-                                <option>Lucida Fax</option>
-                                <option>Magneto</option>
-                                <option>Marlett</option>
-                                <option>Mistral</option>
-                                <option>MS Gothic</option>
-                                <option>MS Outlook</option>
-                                <option>MS PGothic</option>
-                                <option>MV Boli</option>
-                                <option>Nirmala UI</option>
-                                <option>NSimSun</option>
-                                <option>Old English</option>
-                                <option>Onyx</option>
-                                <option>Open Sans</option>
-                                <option>Papyrus</option>
-                                <option>Parchment</option>
-                                <option>Perpetua</option>
-                                <option>Playbill</option>
-                                <option>Pristina</option>
-                                <option>PT Serif</option>
-                                <option>Rage Italic</option>
-                                <option>Ravie</option>
-                                <option>Rockwell</option>
-                                <option>Segoe Print</option>
-                                <option>Segoe UI</option>
-                                <option>SimSun</option>
-                                <option>Sitka Small</option>
-                                <option>Sitka Subhe</option>
-                                <option>Sitka Text</option>
-                                <option>SketchFlow</option>
-                                <option>Snap ITC</option>
-                                <option>Stencil</option>
-                                <option>Sylfaen</option>
-                                <option>Symbol</option>
-                                <option>Tahoma</option>
-                                <option>Tw Cen MT</option>
-                                <option>Verdana</option>
-                                <option>Vivaldi</option>
-                                <option>Webdings</option>
-                                <option>Wide Latin</option>
-                                <option>Wingdings</option>
-                                <option>Yu Gothic</option>-->
+                              
                             </select>
                             <select class="form-control" id="selected-font-size">
                                 <option>14</option>
--
libgit2 0.21.4