Skip to content

Commit

Permalink
Adds spinner to loading images
Browse files Browse the repository at this point in the history
Adds spinner and third-party tools modules

Adds spinner directive and config
  • Loading branch information
omarduarte committed Mar 8, 2015
1 parent fdabab3 commit 0cd6423
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 16 deletions.
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"dependencies": {
"ngCordova": "~0.1.12-alpha",
"socket.io-client": "https://github.com/Automattic/socket.io-client.git#1.3.4",
"angular-uuid4": "~0.3.0"
"angular-uuid4": "~0.3.0",
"angular-spinner": "https://github.com/urish/angular-spinner.git#~0.6.1"
}
}
18 changes: 18 additions & 0 deletions client/www/app/app.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,24 @@
delete $httpProvider.defaults.headers.common["X-Requested-With"];
})

.config(function (usSpinnerConfigProvider) {
usSpinnerConfigProvider.setDefaults({
lines: 11, // The number of lines to draw
length: 21, // The length of each line
width: 2, // The line thickness
radius: 19, // The radius of the inner circle
corners: 1, // Corner roundness (0..1)
rotate: 0, // The rotation offset
direction: 1, // 1: clockwise, -1: counterclockwise
color: '#000', // #rgb or #rrggbb or array of colors
speed: 0.8, // Rounds per second
trail: 48, // Afterglow percentage
// shadow: true, // Whether to render a shadow
top: '50%', // Top position relative to parent
left: '50%' // Left position relative to parent
});
})

.config(function($stateProvider, $urlRouterProvider) {

$stateProvider
Expand Down
3 changes: 1 addition & 2 deletions client/www/app/core/core.module.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
(function() {
'use strict';

angular.module('app.core', ['app.media', 'ngCordova', 'app.tools', 'app.data', 'uuid4']);
angular.module('app.core', ['app.media', 'app.data', 'app.tools', 'app.third-party.tools']);

})();

6 changes: 6 additions & 0 deletions client/www/app/core/third-party.tools.module.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(function() {
'use strict';

angular.module('app.third-party.tools', ['ngCordova','uuid4','angularSpinner']);

})();
1 change: 1 addition & 0 deletions client/www/app/moment/items/showImage.directive.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div class="card image-item-container">
<div class="item item-image-wrap">
<span ng-show="isDownloading" us-spinner></span>
<img ng-src="data:image/jpeg;base64,{{ item.payload }}"/>
</div>
</div>
18 changes: 10 additions & 8 deletions client/www/app/moment/items/showImage.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

function link(scope, element, attrs) {
var vm = scope;

vm.activate = activate;
vm.getPayload = getPayload;
vm.hasPayload = false;
vm.getPayload = getPayload;
vm.hasPayload = false;
vm.isDownloading = false;

activate();

Expand All @@ -28,15 +28,17 @@
function activate() {
// NOTE: utilized $stateParams to access difference between moment and memento scope
if ($stateParams.ID) {
vm.isDownloading = true;
vm.getPayload(vm.item.url, vm.item.type)
.then(function(payload) {
vm.item.payload = payload;
vm.hasPayload = true;
vm.item.payload = payload;
vm.hasPayload = true;
vm.isDownloading = false;
})
.catch(function(err) {
console.error('Error loading image item payload', err);
});
}
});
}
}

function getPayload (url, type) {
Expand Down
1 change: 1 addition & 0 deletions client/www/content/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
height: auto;
width: auto;
max-width: 85vw;
min-height: 75vw;
margin: 0 auto;
}

Expand Down
12 changes: 7 additions & 5 deletions client/www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,24 @@
<!-- ionic/angularjs js -->
<script src="lib/ionic/js/ionic.bundle.js"></script>

<!-- socket.io -->
<script src="lib/socket.io-client/socket.io.js"></script>

<!-- cordova script (this will be a 404 during development) -->
<script src="lib/ngCordova/dist/ng-cordova.js"></script>
<script src="cordova.js"></script>

<!-- angular uuid generator library -->
<!-- Mementos Tools -->
<script src="lib/socket.io-client/socket.io.js"></script>
<script src="lib/angular-uuid4/angular-uuid4.min.js"></script>
<script src="lib/spin.js/spin.js"></script>
<script src="lib/angular-spinner/angular-spinner.min.js"></script>

<!-- your app's js -->
<!-- Mementos' App Scripts -->
<script src="app/auth/user.auth.module.js"></script>
<script src="app/auth/user.signup.js"></script>
<script src="app/auth/user.signin.js"></script>

<script src="app/core/core.module.js"></script>

<script src="app/core/third-party.tools.module.js"></script>

<script src="app/core/logout.js"></script>
<script src="app/core/alerts.service.js"></script>
Expand Down

0 comments on commit 0cd6423

Please sign in to comment.