From 950ecd0d1d12653d3894575deb2b68d4c8ccc191 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Wed, 9 Apr 2014 22:44:19 +0200 Subject: [PATCH] Video modal forward and delete --- app/js/controllers.js | 28 +++++++++++++++++++++++++++- app/js/services.js | 5 ++--- app/partials/message.html | 4 ++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/app/js/controllers.js b/app/js/controllers.js index 1ae73404..874e5ab1 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -990,8 +990,34 @@ angular.module('myApp.controllers', []) }) - .controller('VideoModalController', function ($scope, AppVideoManager) { + .controller('VideoModalController', function ($scope, $rootScope, $modalInstance, PeersSelectService, AppMessagesManager, AppVideoManager, AppPeersManager, ErrorService) { $scope.video = AppVideoManager.wrapForFull($scope.videoID); + + $scope.progress = {enabled: false}; + $scope.player = {}; + + $scope.forward = function () { + var messageID = $scope.messageID; + PeersSelectService.selectPeer().then(function (peerString) { + var peerID = AppPeersManager.getPeerID(peerString); + AppMessagesManager.forwardMessages(peerID, [messageID]).then(function () { + $rootScope.$broadcast('history_focus', {peerString: peerString}); + }); + }); + }; + + $scope.delete = function () { + var messageID = $scope.messageID; + ErrorService.confirm({type: 'MESSAGE_DELETE'}).then(function () { + AppMessagesManager.deleteMessages([messageID]); + }); + }; + + $scope.$on('history_delete', function (e, historyUpdate) { + if (historyUpdate.msgs[$scope.messageID]) { + $modalInstance.dismiss(); + } + }); }) .controller('UserModalController', function ($scope, $location, $rootScope, $modal, AppUsersManager, NotificationsManager, AppMessagesManager, AppPeersManager, PeersSelectService, ErrorService) { diff --git a/app/js/services.js b/app/js/services.js index 40149691..b637077f 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -2185,11 +2185,10 @@ angular.module('myApp.services', []) return video; } - function openVideo (videoID, accessHash) { + function openVideo (videoID, messageID) { var scope = $rootScope.$new(true); scope.videoID = videoID; - scope.progress = {enabled: false}; - scope.player = {}; + scope.messageID = messageID; var modalInstance = $modal.open({ templateUrl: 'partials/video_modal.html', diff --git a/app/partials/message.html b/app/partials/message.html index c6fefd44..754a0eb7 100644 --- a/app/partials/message.html +++ b/app/partials/message.html @@ -101,7 +101,7 @@
- +