Skip to content

Commit 8adbc4c

Browse files
author
yuangongji
authored
Merge pull request #880 from ygj6/master
Update pr 876 examples
2 parents da9e112 + dc51498 commit 8adbc4c

File tree

4 files changed

+28
-56
lines changed

4 files changed

+28
-56
lines changed

examples/issues/pr876/controllers.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

examples/issues/pr876/iframe.html

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
11
<!DOCTYPE html>
2-
<html id="ng-app" ng-app="app"> <!-- id="ng-app" IE<8 -->
2+
<html>
33

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

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

18-
</head>
19-
<body ng-controller="AppController" uploader="uploader">
20-
<a href="javascript:;" class="file_a">
21-
<input type="file" name="file1" nv-file-select uploader="uploader" />
22-
</a>
23-
<button ng-click="upload()">Upload</button>
24-
25-
</body>
26-
</html>
19+
</html>

examples/issues/pr876/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</head>
77

88
<body>
9-
<iframe src="iframe.html"></iframe>
9+
<button onclick="window.showModalDialog('uploadPage.html');">Open iframe</button>
1010
</body>
1111

1212
</html>

examples/issues/pr876/uploadPage.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<title>Upload page</title>
6+
</head>
7+
8+
<body>
9+
<iframe src="iframe.html"></iframe>
10+
</body>
11+
12+
</html>

0 commit comments

Comments
 (0)