ADAM / AIAHTML5

Commit 555befc05189b90dd61bcbef56cadb52652a4499

Authored by unknown
2 parents 8594721e 2591033f

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into LexixconForTrans

Inline Side-by-side
Showing 3 changed files with 37 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @555befc
... ... @@ -410,7 +410,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
410 410  
411 411  
412 412  
  413 + if ($.browser.msie) {
  414 + $("#resetBtn").css("display", "inline-block");
  415 + // $rootScope.refreshCanvas();
413 416  
  417 + }
414 418 $(function () {
415 419 var colpick = $('.demo').each(function () {
416 420  
... ... @@ -3625,5 +3629,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3625 3629 if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey))
3626 3630 $location.path('/'); //Redirecting to landing page
3627 3631 };
  3632 +
  3633 + $rootScope.resetDrawing = function (e) {
  3634 +
  3635 + $('#canvas').removeLayers();
  3636 +
  3637 + };
  3638 +
3628 3639 }]
3629 3640 );
3630 3641 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/Link/iframeresizer.html
  View file @555befc
1   -
2 1 <html>
3 2 <head>
4 3 <title></title>
... ... @@ -52,6 +51,23 @@
52 51 else
53 52 return results[1];
54 53 }
  54 +
  55 + function resizeIframe(dHeight) {
  56 + var iframe = document.getElementById('externalLink');
  57 + if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) {
  58 + var ieversion = new Number(RegExp.$1)
  59 + if (ieversion == 8 || ieversion == 7) {
  60 + iframe.height = parseInt(dHeight) + 250;
  61 + }
  62 + else {
  63 + iframe.height = dHeight;
  64 + }
  65 + }
  66 + else {
  67 + iframe.height = dHeight;
  68 + }
  69 + }
  70 +
55 71 </script>
56 72 </body>
57   -</html>
58 73 \ No newline at end of file
  74 +</html>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @555befc
... ... @@ -155,6 +155,11 @@
155 155 position: relative;
156 156 top: 1px;
157 157 }
  158 +
  159 + #refreshBtn {
  160 + color: #ffffff;
  161 + }
  162 +
158 163 </style>
159 164  
160 165  
... ... @@ -631,6 +636,7 @@
631 636 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="addToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
632 637 <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="addToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
633 638 <!--<button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="addToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="removeToolTipOnMouseOut()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>-->
  639 + <button type="button" class="btn btn-black-annotation" id="resetBtn" style="padding:1px 7px;display:none;" ng-click="resetDrawing()" ng-mouseover="addToolTip(95, 140, 120, 'Reset')" ng-mouseleave="removeToolTipOnMouseOut()"><i class="fa fa-refresh"></i></button>
634 640 </div>
635 641 </div>
636 642 </div>
... ... @@ -654,8 +660,7 @@
654 660 <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="removeToolTipOnMouseOut()"><i class="fa fa-eraser"></i></button>-->&nbsp;
655 661 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
656 662 <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()">
657   - <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
658   - </div>
  663 + <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="rese
659 664 <div style="width: 22px; float: left;">
660 665 <div style="width: 100%; float: left; height: 16px;">
661 666 <button type="button" id="btnBrushSizeIncrement" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
... ... @@ -1910,6 +1915,7 @@
1910 1915 }
1911 1916 }
1912 1917 </script>
  1918 + <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-browser/0.1.0/jquery.browser.min.js"></script>
1913 1919 </body>
1914 1920  
1915 1921 </html>
1916 1922 \ No newline at end of file
... ...