krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tasks cron ryamodal fixes (#8871)

Browse Source 
* Changed assumption of timezone location

* Added checks for RYA and moved cron check

* Fixed modal scope issue
This commit is contained in:
Keith Holliday
2017-07-13 16:11:27 -06:00
committed by Sabe Jones
parent 4cd272f99c
commit bc477455bb
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/client-old/js/controllers/notificationCtrl.js
View File

@@ -1,8 +1,8 @@
'use strict';
habitrpg.controller('NotificationCtrl',
['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', 'Achievement', 'Social', 'Tasks',
function ($scope, $rootScope, Shared, Content, User, Guide, Notification, Analytics, Achievement, Social, Tasks) {
['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', 'Achievement', 'Social', 'Tasks', '$modal',
function ($scope, $rootScope, Shared, Content, User, Guide, Notification, Analytics, Achievement, Social, Tasks, $modal) {
var isRunningYesterdailies = false;
$rootScope.$watch('user', function (after, before) {
@@ -53,7 +53,8 @@ habitrpg.controller('NotificationCtrl',
modalScope.processingYesterdailies = true;
$scope.yesterDailiesModalOpen = true;
$rootScope.openModal('yesterDailies', {
$modal.open({
templateUrl: 'modals/yesterDailies.html',
scope: modalScope,
backdrop: 'static',
controller: ['$scope', 'Tasks', 'User', '$rootScope', function ($scope, Tasks, User, $rootScope) {