Skip to content

Commit

Permalink
Fixed #205
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan authored and Dan committed May 8, 2014
1 parent d6ef041 commit 3cf4526
Show file tree
Hide file tree
Showing 18 changed files with 574 additions and 444 deletions.
9 changes: 9 additions & 0 deletions demo/war/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,13 @@ button {
color: #777;
padding-top: 5px;
padding-left: 10px;
}

.err {
font-size: 12px;
color: #C53F00;
margin: 15px;
padding: 15px;
background-color: #F0F0F0;
border: 1px solid black;
}
7 changes: 4 additions & 3 deletions demo/war/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,17 @@ <h3>
<a href="https://github.com/danialfarid/angular-file-upload/issues/87">imgur</a>, etc... for HTML5 FileReader browsers.<br/>
</div><br/>
myModel: <input type="text" ng-model="myModel"> model object to be sent with the file.<br/>
choose a single file: <input type="file" ng-file-select="onFileSelect($files)">
choose a single file: <input type="file" ng-file-select="onFileSelect($files)" ng-click="resetInputFile()">
<br/>
or multiple files: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type="file" ng-file-select="onFileSelect($files)" multiple>
or multiple files: &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <input type="file" ng-file-select="onFileSelect($files)" multiple ng-click="resetInputFile()">
<br/>
<br/>
<div ng-show="dropSupported" class="drop-box" ng-file-drop="onFileSelect($files);" ng-file-drop-available="dropSupported=true">or drop files here</div>
<div ng-show="!dropSupported">HTML5 Drop File is not supported on this browser</div>
<br/>
<input type="checkbox" ng-model="uploadRightAway">Upload right away
<br/>
<div class="err" ng-show="errorMsg != null">{{errorMsg}}</div>
<br/>
Progress:
<br/>
Expand Down Expand Up @@ -78,6 +79,6 @@ <h3>
</ul>
</div>
</div>
<div style="position:absolute;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-03-27</div>
<div style="position:fixed;bottom:10px;right:10px;font-size:smaller;color:#777">Last update: 2014-05-08</div>
</body>
</html>
Binary file modified demo/war/js/FileAPI.flash.swf
Binary file not shown.
Loading

0 comments on commit 3cf4526

Please sign in to comment.