Skip to content

Commit

Permalink
disabled imageDimensions (bug ngFileUpload?)
Browse files Browse the repository at this point in the history
  • Loading branch information
thegitfather committed Apr 20, 2016
1 parent 1750212 commit fb318fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion client/app/gallery/gallery-create.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ angular.module('photoboxApp')
ngfKeep: "'distinct'",
ngfMinRatio: "2:3.01",
ngfMaxRatio: "16.01:9",
ngfMinWidth: "400",
ngfMaxWidth: "4400",
ngModelOptions: { allowInvalid: true }
});

Expand All @@ -29,10 +31,11 @@ angular.module('photoboxApp')
}

$scope.$watchCollection('vm.files', function(newVal, oldVal) {
console.log("newVal:", newVal);
var fileErrors = 0;
for (var i = 0; i < newVal.length; i++) {
if (newVal[i].dimensions === undefined) {
appendDimensions(newVal[i]);
// appendDimensions(newVal[i]);
}
if (newVal[i].$error !== undefined) {
fileErrors += 1;
Expand Down
6 changes: 3 additions & 3 deletions client/components/upload-list/upload-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="pseudo-table">
<div class="row head">
<div class="cell name">Filename</div>
<div class="cell image-dims">Dimensions</div>
<!-- <div class="cell image-dims">Dimensions</div> -->
<div class="cell size">Size</div>
<div class="cell upload-progress">Upload progress</div>
<div class="cell preview-thumb">Preview</div>
Expand All @@ -12,9 +12,9 @@
<div class="cell name">
{{file.name}}
</div>
<div class="cell image-dims">
<!-- <div class="cell image-dims">
{{ file.dimensions.width }}&times;{{ file.dimensions.height }}
</div>
</div> -->
<div class="cell size">
{{convertBytesToKB(file.size)}} KB
</div>
Expand Down

0 comments on commit fb318fc

Please sign in to comment.