diff --git a/lib/events/Controller.js b/lib/events/Controller.js
index 76ef5339..fd02003a 100644
--- a/lib/events/Controller.js
+++ b/lib/events/Controller.js
@@ -265,7 +265,11 @@
/** Adding/Editing Events **/
- $scope.addEvent = function() {
+ $scope.addEvent = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
EditEvent.open();
};
@@ -337,7 +341,11 @@
});
};
- $scope.goToNow = function() {
+ $scope.goToNow = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
$timeout(function() {
var id, nextEvent = EventService.getNextEvent($scope.events);
$log.debug('next event=' + angular.toJson(nextEvent));
diff --git a/lib/events/Edit.js b/lib/events/Edit.js
index f4d5ff37..e98794ff 100644
--- a/lib/events/Edit.js
+++ b/lib/events/Edit.js
@@ -116,7 +116,11 @@
}
};
- $scope.saveEvent = function() {
+ $scope.saveEvent = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
$log.debug('CMEditEventCtrl.saveEvent: ' + angular.toJson($scope.eventData));
var username = UserService.getUsername();
@@ -189,7 +193,11 @@
$scope.modal.resolve(modal);
});
- $scope.closeEditEvent = function() {
+ $scope.closeEditEvent = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
return $scope.modal.promise.then(function(modal) {
return $q.all([
$scope.closeKeyboard(),
diff --git a/lib/events/edit.html b/lib/events/edit.html
index a9152120..b8d49c8c 100644
--- a/lib/events/edit.html
+++ b/lib/events/edit.html
@@ -5,7 +5,7 @@
{{eventData.id? 'Edit':'Add an'}} Event
-
+
diff --git a/lib/events/list.html b/lib/events/list.html
index b082a146..c4cffdda 100644
--- a/lib/events/list.html
+++ b/lib/events/list.html
@@ -1,12 +1,12 @@
-
+
{{eventType.capitalize()}} Events ▼
-
+
diff --git a/lib/images/Viewer.js b/lib/images/Viewer.js
index 99e96806..79f2fa83 100644
--- a/lib/images/Viewer.js
+++ b/lib/images/Viewer.js
@@ -35,7 +35,11 @@
});
};
- $scope.closeModal = function() {
+ $scope.closeModal = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
$scope.modal.promise.then(function(modal) {
modal.hide().then(function() {
delete $scope.twitarrRoot;
diff --git a/lib/images/viewer.html b/lib/images/viewer.html
index 052b6f00..e0d0a8c6 100644
--- a/lib/images/viewer.html
+++ b/lib/images/viewer.html
@@ -1,7 +1,7 @@
-
+
diff --git a/lib/index.js b/lib/index.js
index bd6ae3e8..e3386186 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -314,6 +314,10 @@
}
modal.scope.showEmoji = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
EmojiService.show(ev).then(function(selected) {
if (modal.scope.tweet.text.length === 0) {
modal.scope.tweet.text += ':' + selected + ':';
@@ -393,7 +397,11 @@
}, onError);
};
- modal.scope.closeModal = function() {
+ modal.scope.closeModal = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
modal.hide();
};
modal.scope.addPhoto = function() {
@@ -402,7 +410,11 @@
modal.scope.takePhoto = function() {
doPhoto(Camera.PictureSourceType.CAMERA);
};
- modal.scope.postTweet = function(tweet) {
+ modal.scope.postTweet = function(ev, tweet) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
var tweetCmd = Twitarr.addTweet;
if (tweet.id) {
tweetCmd = Twitarr.updateTweet;
diff --git a/lib/seamail/Controller.js b/lib/seamail/Controller.js
index 2ccc71d5..bdd92e02 100644
--- a/lib/seamail/Controller.js
+++ b/lib/seamail/Controller.js
@@ -32,7 +32,11 @@
scope.selectedIndex=-1;
//$log.debug('additional user: ' + angular.toJson(scope.additionalUser));
- scope.removeTag=function(index){
+ scope.removeTag=function(ev, index){
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
scope.selectedUsers.splice(index,1);
};
@@ -252,7 +256,11 @@
});
};
- $scope.newSeamail = function() {
+ $scope.newSeamail = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
NewSeamail.open();
};
diff --git a/lib/seamail/New.js b/lib/seamail/New.js
index d3f82696..fb056650 100644
--- a/lib/seamail/New.js
+++ b/lib/seamail/New.js
@@ -12,7 +12,11 @@
.controller('NewSeamailCtrl', function($ionicPopup, $log, $rootScope, $scope, Twitarr) {
$log.debug('Initializing NewSeamailCtrl.');
- $scope.postSeamail = function(message) {
+ $scope.postSeamail = function(ev, message) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
$log.debug('message=' + angular.toJson(message));
Twitarr.postSeamail(message).then(function() {
$scope.closeModal();
@@ -45,7 +49,11 @@
$scope.modal.resolve(modal);
});
- $scope.closeModal = function() {
+ $scope.closeModal = function(ev) {
+ if (ev) {
+ ev.preventDefault();
+ ev.stopPropagation();
+ }
$scope.modal.promise.then(function(modal) {
modal.hide().then(function() {
delete $scope.sendTo;
diff --git a/lib/seamail/autocomplete-template.html b/lib/seamail/autocomplete-template.html
index 9a58dbde..d3c4d9c9 100644
--- a/lib/seamail/autocomplete-template.html
+++ b/lib/seamail/autocomplete-template.html
@@ -4,7 +4,7 @@
To:
{{additionalUser}}
- {{selectedUser}}
+ {{selectedUser}}
diff --git a/lib/seamail/new.html b/lib/seamail/new.html
index d1102d36..3857d66c 100644
--- a/lib/seamail/new.html
+++ b/lib/seamail/new.html
@@ -2,11 +2,11 @@