Commit 34c983dcb2f1f36ca66fe1fb8cc0be4e4eec70d3
Merge branch 'logoexprtimageissue' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
Showing
2 changed files
with
10 additions
and
1 deletions
400-SOURCECODE/AIAHTML5.Web/index.html
| @@ -1893,6 +1893,7 @@ | @@ -1893,6 +1893,7 @@ | ||
| 1893 | <script> | 1893 | <script> |
| 1894 | $(function () { | 1894 | $(function () { |
| 1895 | $("#btnSaveEI").click(function () { | 1895 | $("#btnSaveEI").click(function () { |
| 1896 | + $("#canvasDiv").append("<img id='exportlogo' class='img-responsive' src='content/images/adam-logo-small.png'/>"); | ||
| 1896 | html2canvas($("#canvasDiv"), { | 1897 | html2canvas($("#canvasDiv"), { |
| 1897 | onrendered: function (canvas) { | 1898 | onrendered: function (canvas) { |
| 1898 | theCanvas = canvas; | 1899 | theCanvas = canvas; |
| @@ -1902,6 +1903,7 @@ | @@ -1902,6 +1903,7 @@ | ||
| 1902 | var dataURL = canvas.toDataURL("image/jpeg"); | 1903 | var dataURL = canvas.toDataURL("image/jpeg"); |
| 1903 | var blob = dataURItoBlob(dataURL); | 1904 | var blob = dataURItoBlob(dataURL); |
| 1904 | saveAs(blob, fileName); | 1905 | saveAs(blob, fileName); |
| 1906 | + $("#exportlogo").remove(); | ||
| 1905 | $("#filename").val(""); | 1907 | $("#filename").val(""); |
| 1906 | } | 1908 | } |
| 1907 | }); | 1909 | }); |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css