Skip to content

Commit

Permalink
fixed IE8-9, changed default value for hide-on-drop-not-available
Browse files Browse the repository at this point in the history
  • Loading branch information
Danial Farid authored and Danial Farid committed Mar 12, 2015
1 parent b553088 commit 998b0dc
Show file tree
Hide file tree
Showing 16 changed files with 504 additions and 502 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ classes/
*.jar
release-local.sh
npm-debug.log
/.idea
120 changes: 93 additions & 27 deletions demo/war/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions demo/war/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@ body {

fieldset {
border: 1px solid #DDD;
width: 490px;
width: 420px;
padding: 10px;
line-height: 23px;
line-height: 23px;
}

fieldset label {
/*font-size: smaller;*/
}

.progress {
Expand All @@ -65,7 +69,7 @@ fieldset {
text-align: center;
padding-top: 25px;
float: left;
margin-left: 20px;
margin-left: 10px;
}

.up-buttons {
Expand Down
15 changes: 9 additions & 6 deletions demo/war/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h3>
<div style="float:left; margin-right: 10px;">
<form name="myForm">
<fieldset><legend>Upload on form submit</legend>
Username: <input type="text" name="userName" ng-model="username" size="48" required>
Username: <input type="text" name="userName" ng-model="username" size="39" required>
<i ng-show="myForm.userName.$error.required">*required</i><br>
Profile Picture: <input type="file" ng-file-select ng-model="picFile" name="file" accept="image/*"
ng-file-change="generateThumb(picFile[0], $files)" required>
Expand All @@ -85,15 +85,17 @@ <h3>
</div>
<div ng-file-drop ng-file-select ng-model="files" ng-model-rejected="rejFiles"
drag-over-class="{accept:'dragover', reject:'dragover-err', delay:100}" class="drop-box"
ng-multiple="true" allow-dir="true" ng-accept="'image/*,application/pdf'">
Drop Images or PDFs<div>or click to select</div>
ng-multiple="true" allow-dir="true" ng-accept="'image/*,application/pdf'"
drop-available="dropAvailable">
<div ng-hide="dropAvailable">File Drop not available</div>
<div ng-show="dropAvailable">Drop Images or PDFs</div>
<div>click to select</div>
</div>
<div ng-no-file-drop class="drop-box">File Farg&Drop not supported on your browser</div>
</fieldset>
</div>
<fieldset><legend>Play with attributes</legend>
<label>ng-accept (accept/reject file model): <input type="text" ng-model="accept"></label><br/>
<label>accept (browser dependent select window filter): <input type="text" ng-model="acceptSelect"></label><br/>
<label>accept (for select browser dependent): <input type="text" ng-model="acceptSelect"></label><br/>
<label>ng-capture (for mobile): <input type="text" ng-model="capture"></label><br/>
<label><input type="checkbox" ng-model="multiple" >ng-multiple (allow multiple files)</label><br/>
<label><input type="checkbox" ng-model="disabled">ng-disabled</label><br/>
Expand All @@ -104,7 +106,8 @@ <h3>
ng-multiple="multiple" ng-accept="accept" accept="{{acceptSelect}}"
ng-disabled="disabled" ng-capture="capture"
drag-over-class="{accept:'dragover', reject:'dragover-err', delay:100}"
allow-dir="allowDir" class="drop-box">Select File or Drop</div><br/>
allow-dir="allowDir" class="drop-box" drop-available="dropAvailable">Select File
<span ng-show="dropAvailable">or Drop</span></div><br/>
</div>
</fieldset>
<br/>
Expand Down
Loading

0 comments on commit 998b0dc

Please sign in to comment.