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

unknown
2 parents 8594721e 2591033f
Showing 3 changed files with 37 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/Link/iframeresizer.html
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -410,7 +410,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
+        if ($.browser.msie) {
+            $("#resetBtn").css("display", "inline-block");
+         //   $rootScope.refreshCanvas();
+        }
         $(function () {
             var colpick = $('.demo').each(function () {
@@ -3625,5 +3629,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey))
             $location.path('/'); //Redirecting to landing page
     };
+
+    $rootScope.resetDrawing = function (e) {
+       
+            $('#canvas').removeLayers();
+      
+    };
+
 }]
 );
 \ No newline at end of file
-
 <html> 
 <head>
 <title></title>
@@ -52,6 +51,23 @@
             else
                 return results[1];
         }
+
+        function resizeIframe(dHeight) {
+            var iframe = document.getElementById('externalLink');
+            if (/MSIE (\d+\.\d+);/.test(navigator.userAgent)) {
+                var ieversion = new Number(RegExp.$1)
+                if (ieversion == 8 || ieversion == 7) {
+                    iframe.height = parseInt(dHeight) + 250;
+                }
+                else {
+                    iframe.height = dHeight;
+                }
+            }
+            else {
+                iframe.height = dHeight;
+            }
+        }
+
        
     </script> 
   </body> 
-</html>
 \ No newline at end of file
+</html>
@@ -155,6 +155,11 @@
             position: relative;
             top: 1px;
         }
+
+        #refreshBtn {
+            color: #ffffff;
+        }
+
     </style>
@@ -631,6 +636,7 @@
                                                 <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>
                                                 <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>
                                                 <!--<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>-->
+                                                <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>
                                             </div>
                                         </div>
                                     </div>
@@ -654,8 +660,7 @@
                                                 <!--<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;
                                                 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
                                                     <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="removeToolTipOnMouseOut()">
-                                                        <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
-                                                    </div>
+                                                        <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="rese
                                                     <div style="width: 22px; float: left;">
                                                         <div style="width: 100%; float: left; height: 16px;">
                                                             <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 @@
             }
         }
     </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-browser/0.1.0/jquery.browser.min.js"></script>
 </body>
 </html>
 \ No newline at end of file