ADAM / AIAHTML5

Commit 434271d200e0a2940d6392cda44f59088f836004

Authored by unknown
1 parent 082c0091

Home_Controller_orig_file

Inline Side-by-side
Showing 1 changed file with 6 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js.orig
  View file @434271d
@@ -195,13 +195,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -195,13 +195,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
195 $(".btn-annotation-rectangle").addClass("activebtncolor"); 195 $(".btn-annotation-rectangle").addClass("activebtncolor");
196 } 196 }
197 $rootScope.paintBrush = function () { 197 $rootScope.paintBrush = function () {
198 -<<<<<<< HEAD  
199 // debugger; 198 // debugger;
200 // $('.btnCursor').addClass('activebtncolor'); 199 // $('.btnCursor').addClass('activebtncolor');
201 -=======  
202 -  
203 - $('.btnCursor').addClass('activebtncolor');  
204 ->>>>>>> db0b2ac40dc61ee08fb471800773516967978732  
205 $rootScope.switchCanvasToPaintCanvas(); 200 $rootScope.switchCanvasToPaintCanvas();
206 $rootScope.shapeType = "FreeStylePaint"; 201 $rootScope.shapeType = "FreeStylePaint";
207 var a = $("#amount-2").val(); 202 var a = $("#amount-2").val();
@@ -304,6 +299,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, @@ -304,6 +299,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
304 $rootScope.shapestyle = function (id) { 299 $rootScope.shapestyle = function (id) {
305 300
306 document.getElementById('modelbackground').style.display = "none"; 301 document.getElementById('modelbackground').style.display = "none";
  302 + document.getElementById('modeleditstyle').style.display = "none";
307 303
308 $rootScope.shapestyleOpacity = $("#" + id).css('opacity'); 304 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
309 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color'); 305 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
@@ -325,20 +321,22 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, @@ -325,20 +321,22 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
325 321
326 322
327 ======= 323 =======
328 - $('#editshapestyle').modal('hide');  
329 ->>>>>>> db0b2ac40dc61ee08fb471800773516967978732 324 + // $('#editshapestyle').modal('hide');
  325 +>>>>>>> 5bc4a80b843ca0ce3ce2fcff6378527e0aa407d7
330 } 326 }
331 327
332 $rootScope.enableAnnotationToolBar = function () { 328 $rootScope.enableAnnotationToolBar = function () {
333 329
334 document.getElementById('modelbackground').style.display = "block"; 330 document.getElementById('modelbackground').style.display = "block";
335 - $("#editshapestyle").modal('show'); 331 + // $("#editshapestyle").modal('show');
  332 + document.getElementById('modeleditstyle').style.display = "block";
336 333
337 } 334 }
338 335
339 $rootScope.disableAnnotationToolBar = function () { 336 $rootScope.disableAnnotationToolBar = function () {
340 337
341 document.getElementById('modelbackground').style.display = "none"; 338 document.getElementById('modelbackground').style.display = "none";
  339 + document.getElementById('modeleditstyle').style.display = "none";
342 340
343 } 341 }
344 342