Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Swithcing out old ngImgCrop dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
hyperreality committed Sep 2, 2016
1 parent fbd8781 commit 9d91cb6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"angular-ui-router": "~0.2.18",
"bootstrap": "~3.3.6",
"ng-file-upload": "^12.1.0",
"ng-img-crop": "ngImgCrop#^0.3.2",
"ng-img-crop-full-extended": "ngImgCropFullExtended#~6.0.1",
"owasp-password-strength-test": "~1.3.0"
},
"overrides": {
Expand Down
4 changes: 2 additions & 2 deletions config/assets/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
// bower:css
'public/lib/bootstrap/dist/css/bootstrap.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.css',
'public/lib/ng-img-crop/compile/unminified/ng-img-crop.css'
'public/lib/ng-img-crop-full-extended/compile/minified/ng-img-crop.css'
// endbower
],
js: [
Expand All @@ -18,7 +18,7 @@ module.exports = {
'public/lib/angular-animate/angular-animate.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.js',
'public/lib/ng-file-upload/ng-file-upload.js',
'public/lib/ng-img-crop/compile/unminified/ng-img-crop.js',
'public/lib/ng-img-crop-full-extended/compile/minified/ng-img-crop.js',
'public/lib/angular-messages/angular-messages.js',
'public/lib/angular-mocks/angular-mocks.js',
'public/lib/angular-resource/angular-resource.js',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<form name="vm.userForm" class="signin form-horizontal">
<fieldset>
<div ng-show="vm.nowResizing" class="text-center">
<p><span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span> Preparing your picture for cropping...</p>
<p><span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span> Preparing for cropping...</p>
</div>
<div ng-show="vm.pictureSelected" class="text-center">
<p>Crop your picture then press upload below</p>
<div class="cropArea">
<img-crop image="vm.picFile | ngfDataUrl" result-image="croppedDataUrl" ng-init="croppedDataUrl=''"></img-crop>
<img-crop image="vm.picFile | ngfDataUrl" result-image="croppedDataUrl" ng-init="croppedDataUrl=''" chargement="'Loading'"></img-crop>
</div>
</div>
<div class="form-group text-center">
Expand Down

0 comments on commit 9d91cb6

Please sign in to comment.