Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-05-07 21:45:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(messages): new message type of must read, if user has a not read message and this message is must read, so, user must read it otherwise can not do other operate

Browse Source
This commit is contained in:
OldHawk
2018-05-28 00:03:58 +08:00
parent efe1acc3ed
commit f3e4b86a3a
18 changed files with 269 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
modules/core/client/controllers/header.client.controller.js
View File

@@ -5,11 +5,13 @@
.module('core')
.controller('HeaderController', HeaderController);
HeaderController.$inject = ['$scope', '$state', '$timeout', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService',
'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService', 'UsersService', 'DebugConsoleService', 'getStorageLangService'];
HeaderController.$inject = ['$scope', '$rootScope', '$state', '$timeout', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService',
'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'marked', 'UsersService', 'DebugConsoleService', 'getStorageLangService',
'AdminMessagesService'];
function HeaderController($scope, $state, $timeout, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService,
InvitationsService, $interval, MessagesService, TorrentsService, UsersService, mtDebug, getStorageLangService) {
function HeaderController($scope, $rootScope, $state, $timeout, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService,
InvitationsService, $interval, MessagesService, marked, UsersService, mtDebug, getStorageLangService,
AdminMessagesService) {
$scope.$state = $state;
var vm = this;
vm.user = Authentication.user;
@@ -37,15 +39,26 @@
/**
* document.ready()
*/
$(document).ready(function () {
$('#warning_popup').popup({
angular.element(document).ready(function () {
$('#must_read_popup').popup({
outline: false,
focusdelay: 400,
vertical: 'top',
autoopen: false,
opacity: 0.6,
blur: false,
escape: false,
closetransitionend: function () {
$('.popup_wrapper').remove();
if ($scope.mustReadMessage.markReadMessage) {
var mrMsg = new AdminMessagesService({
_adminMessageId: $scope.mustReadMessage._id
});
mrMsg.$update(function (res) {
$timeout(function () {
vm.getCountUnread();
}, 10);
});
}
}
});
});
@@ -190,23 +203,6 @@
}
};
/**
* getWarningInfo
*/
vm.getWarningInfo = function () {
var sw = localStorageService.get('showed_warning');
if (vm.appConfig.showDemoWarningPopup && !sw) {
$timeout(function () {
$('#warning_popup').popup('show');
}, 10);
localStorageService.set('showed_warning', true);
}
if (sw) {
$('.popup_wrapper').remove();
}
};
/**
* checkMessageUnread
*/
@@ -219,10 +215,30 @@
if (Authentication.user) {
MessagesService.countUnread(function (data) {
vm.unreadCount = data.countAll;
if (data.mustRead.length > 0) {
$rootScope.mustReadMessage = data.mustRead[0];
$rootScope.mustReadMessage.markReadMessage = false;
$timeout(function () {
$('#must_read_popup').popup('show');
}, 10);
}
});
}
};
/**
* getMustReadMessageContentMarked
* @param m
* @returns {*}
*/
$rootScope.getMustReadMessageContentMarked = function (m) {
if (m) {
return marked(m.content, {sanitize: true});
}
};
/**
* checkHnRWarning
*/
@@ -261,20 +277,7 @@
$translate.use(langKey);
$state.reload();
//$state.transitionTo($state.current, $stateParams, {
// reload: true, inherit: false, notify: false
//});
}
};
/**
* getSiteInfo
*/
vm.getSiteInfo = function () {
TorrentsService.siteInfo(function (data) {
vm.siteInfo = data;
mtDebug.info(data);
});
};
}
}());