ADAM / AIAHTML5

Commit 90e94162e94465b3d183d4cd497d7a1e67a49035

Authored by Amrita Vishnoi
1 parent 2751a4bc

merged Annotation tool bar code.

Inline Side-by-side
Showing 8 changed files with 7 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @90e9416
... ... @@ -138,6 +138,12 @@
138 138 <Content Include="content\images\common\skin2.jpg" />
139 139 <Content Include="content\images\common\skin3.jpg" />
140 140 <Content Include="content\images\common\skin4.jpg" />
  141 + <Content Include="content\images\DA\75\body-views\3\layers\0\1\A\2303.jpg" />
  142 + <Content Include="content\images\DA\75\body-views\3\layers\0\1\A\2303_mci.png" />
  143 + <Content Include="content\images\DA\75\body-views\3\layers\0\1\B\2303.jpg" />
  144 + <Content Include="content\images\DA\75\body-views\3\layers\0\1\B\2303_mci.png" />
  145 + <Content Include="content\images\DA\75\body-views\3\layers\0\1\L\2303.jpg" />
  146 + <Content Include="content\images\DA\75\body-views\3\layers\0\1\L\2303_mci.png" />
141 147 <Content Include="content\images\DA\ethnicity\body-views\10\A\navigator_images\da_oi_101.jpg" />
142 148 <Content Include="content\images\DA\ethnicity\body-views\10\A\thumbnails\da_tni_3344_A.jpg" />
143 149 <Content Include="content\images\DA\ethnicity\body-views\10\B\navigator_images\da_oi_103.jpg" />
... ... @@ -43077,7 +43083,6 @@
43077 43083 <Content Include="libs\jquery\jquery_plugin\SpeechBubble\images\bubble\topRightArrow.png" />
43078 43084 <Content Include="libs\jquery\jquery_plugin\SpeechBubble\images\other\dot.gif" />
43079 43085 <Content Include="libs\jquery\jquery_plugin\SpeechBubble\index.html" />
43080   - <Content Include="libs\sketch.js" />
43081 43086 <Content Include="libs\videogular\vg-controls.min.js" />
43082 43087 <Content Include="libs\videogular\videogular.js" />
43083 43088 <Content Include="libs\videogular\videogular.min.js" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @90e9416
... ... @@ -6222,7 +6222,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6222 6222  
6223 6223  
6224 6224 if (event.which == 46) {
6225   - debugger;
  6225 + //debugger;
6226 6226 if ($rootScope.shapeTypePin == "Pin") {
6227 6227  
6228 6228  
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/A/2303.jpg 0 → 100644
View file @90e9416

89.6 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/A/2303_mci.png 0 → 100644
View file @90e9416

28.8 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/B/2303.jpg 0 → 100644
View file @90e9416

89.6 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/B/2303_mci.png 0 → 100644
View file @90e9416

28.8 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/L/2303.jpg 0 → 100644
View file @90e9416

89.6 KB
400-SOURCECODE/AIAHTML5.Web/content/images/da/75/body-views/3/layers/0/1/L/2303_mci.png 0 → 100644
View file @90e9416

28.8 KB