Skip to content

Commit

Permalink
Merge pull request #880 from ygj6/master
Browse files Browse the repository at this point in the history
Update pr 876 examples
  • Loading branch information
yuangongji authored Jul 4, 2020
2 parents da9e112 + dc51498 commit 8adbc4c
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 56 deletions.
33 changes: 0 additions & 33 deletions examples/issues/pr876/controllers.js

This file was deleted.

37 changes: 15 additions & 22 deletions examples/issues/pr876/iframe.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
<!DOCTYPE html>
<html id="ng-app" ng-app="app"> <!-- id="ng-app" IE<8 -->
<html>

<head>
<title>Simple example</title>
<!-- Fix for old browsers -->
<script src="http://nervgh.github.io/js/es5-shim.min.js"></script>
<script src="http://nervgh.github.io/js/es5-sham.min.js"></script>
<script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>
<script src="../../console-sham.js"></script>
<head>
<title>iframe page</title>
<script>
function test() {
var file = document.getElementsByName("testUpload")[0].files[0];
console.log(file instanceof File);
}
</script>
</head>

<!--<script src="../bower_components/angular/angular.js"></script>-->
<script src="http://code.angularjs.org/1.2.0/angular.min.js"></script>
<script src="../../../dist/angular-file-upload.js"></script>
<script src="controllers.js"></script>
</style>
<body>
<input type="file" name="testUpload" />
<button onclick="test();">test</button>
</body>

</head>
<body ng-controller="AppController" uploader="uploader">
<a href="javascript:;" class="file_a">
<input type="file" name="file1" nv-file-select uploader="uploader" />
</a>
<button ng-click="upload()">Upload</button>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion examples/issues/pr876/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</head>

<body>
<iframe src="iframe.html"></iframe>
<button onclick="window.showModalDialog('uploadPage.html');">Open iframe</button>
</body>

</html>
12 changes: 12 additions & 0 deletions examples/issues/pr876/uploadPage.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>

<head>
<title>Upload page</title>
</head>

<body>
<iframe src="iframe.html"></iframe>
</body>

</html>

0 comments on commit 8adbc4c

Please sign in to comment.