Fix Conflicts:

.gitignore
	index.html
	js/controllers/backup.js
	js/controllers/sidebar.js
This commit is contained in:
Gustavo Maximiliano Cortez 2014-07-28 12:28:07 -03:00
commit 85aa5842f1
74 changed files with 5237 additions and 200 deletions

View file

@ -198,7 +198,12 @@ factory('notification', ['$timeout',
$timeout(function removeFromQueueTimeout() {
queue.splice(queue.indexOf(notification), 1);
}, settings[type].duration);
}
// Movile notification
window.navigator.vibrate([200,100,200]);
if (document.hidden && (type == 'info' || type == 'funds')) {
new window.Notification(title, {body: content, icon:'img/notification.png'});
}
this.save();