mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-10-29 04:04:47 +01:00
Encapsulate directive functions in anonymous functions - avoid the global namespace
This commit is contained in:
Kevin Gisi
@@ -1,23 +1,25 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('focusMe', focusMe);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('focusMe', focusMe);
|
||||
|
||||
focusMe.$inject = [
|
||||
'$timeout',
|
||||
'$parse'
|
||||
];
|
||||
focusMe.$inject = [
|
||||
'$timeout',
|
||||
'$parse'
|
||||
];
|
||||
|
||||
function focusMe($timeout, $parse) {
|
||||
return {
|
||||
link: function(scope, element, attrs) {
|
||||
var model = $parse(attrs.focusMe);
|
||||
scope.$watch(model, function(value) {
|
||||
$timeout(function() {
|
||||
element[0].focus();
|
||||
function focusMe($timeout, $parse) {
|
||||
return {
|
||||
link: function(scope, element, attrs) {
|
||||
var model = $parse(attrs.focusMe);
|
||||
scope.$watch(model, function(value) {
|
||||
$timeout(function() {
|
||||
element[0].focus();
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,44 +1,46 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('fromNow', fromNow);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('fromNow', fromNow);
|
||||
|
||||
fromNow.$inject = [
|
||||
'$interval',
|
||||
'$timeout'
|
||||
];
|
||||
fromNow.$inject = [
|
||||
'$interval',
|
||||
'$timeout'
|
||||
];
|
||||
|
||||
function fromNow($interval, $timeout) {
|
||||
return function(scope, element, attr){
|
||||
var interval, timeout;
|
||||
function fromNow($interval, $timeout) {
|
||||
return function(scope, element, attr){
|
||||
var interval, timeout;
|
||||
|
||||
var updateText = function(){
|
||||
element.text(moment(scope.message.timestamp).fromNow());
|
||||
};
|
||||
var updateText = function(){
|
||||
element.text(moment(scope.message.timestamp).fromNow());
|
||||
};
|
||||
|
||||
var setupInterval = function() {
|
||||
if(interval) $interval.cancel(interval);
|
||||
if(timeout) $timeout.cancel(timeout);
|
||||
var setupInterval = function() {
|
||||
if(interval) $interval.cancel(interval);
|
||||
if(timeout) $timeout.cancel(timeout);
|
||||
|
||||
var diff = moment().diff(scope.message.timestamp, 'minute');
|
||||
var diff = moment().diff(scope.message.timestamp, 'minute');
|
||||
|
||||
if(diff < 60) {
|
||||
// Update every minute
|
||||
interval = $interval(updateText, 60000, false);
|
||||
timeout = $timeout(setupInterval, diff * 60000);
|
||||
} else {
|
||||
// Update every hour
|
||||
interval = $interval(updateText, 3600000, false);
|
||||
}
|
||||
};
|
||||
if(diff < 60) {
|
||||
// Update every minute
|
||||
interval = $interval(updateText, 60000, false);
|
||||
timeout = $timeout(setupInterval, diff * 60000);
|
||||
} else {
|
||||
// Update every hour
|
||||
interval = $interval(updateText, 3600000, false);
|
||||
}
|
||||
};
|
||||
|
||||
updateText();
|
||||
setupInterval();
|
||||
updateText();
|
||||
setupInterval();
|
||||
|
||||
scope.$on('$destroy', function() {
|
||||
if(interval) $interval.cancel(interval);
|
||||
if(timeout) $timeout.cancel(timeout);
|
||||
});
|
||||
scope.$on('$destroy', function() {
|
||||
if(interval) $interval.cancel(interval);
|
||||
if(timeout) $timeout.cancel(timeout);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,61 +1,63 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('habitrpgTasks', habitrpgTasks);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('habitrpgTasks', habitrpgTasks);
|
||||
|
||||
habitrpgTasks.$inject = [
|
||||
'$rootScope',
|
||||
'User'
|
||||
];
|
||||
habitrpgTasks.$inject = [
|
||||
'$rootScope',
|
||||
'User'
|
||||
];
|
||||
|
||||
function habitrpgTasks($rootScope, User) {
|
||||
return {
|
||||
restrict: 'EA',
|
||||
templateUrl: 'templates/habitrpg-tasks.html',
|
||||
//transclude: true,
|
||||
//scope: {
|
||||
// main: '@', // true if it's the user's main list
|
||||
// obj: '='
|
||||
//},
|
||||
link: function(scope, element, attrs) {
|
||||
// $scope.obj needs to come from controllers, so we can pass by ref
|
||||
scope.main = attrs.main;
|
||||
scope.modal = attrs.modal;
|
||||
var dailiesView;
|
||||
if(User.user.preferences.dailyDueDefaultView) {
|
||||
dailiesView = "remaining";
|
||||
} else {
|
||||
dailiesView = "all";
|
||||
}
|
||||
$rootScope.lists = [
|
||||
{
|
||||
header: window.env.t('habits'),
|
||||
type: 'habit',
|
||||
placeHolder: window.env.t('newHabit'),
|
||||
placeHolderBulk: window.env.t('newHabitBulk'),
|
||||
view: "all"
|
||||
}, {
|
||||
header: window.env.t('dailies'),
|
||||
type: 'daily',
|
||||
placeHolder: window.env.t('newDaily'),
|
||||
placeHolderBulk: window.env.t('newDailyBulk'),
|
||||
view: dailiesView
|
||||
}, {
|
||||
header: window.env.t('todos'),
|
||||
type: 'todo',
|
||||
placeHolder: window.env.t('newTodo'),
|
||||
placeHolderBulk: window.env.t('newTodoBulk'),
|
||||
view: "remaining"
|
||||
}, {
|
||||
header: window.env.t('rewards'),
|
||||
type: 'reward',
|
||||
placeHolder: window.env.t('newReward'),
|
||||
placeHolderBulk: window.env.t('newRewardBulk'),
|
||||
view: "all"
|
||||
function habitrpgTasks($rootScope, User) {
|
||||
return {
|
||||
restrict: 'EA',
|
||||
templateUrl: 'templates/habitrpg-tasks.html',
|
||||
//transclude: true,
|
||||
//scope: {
|
||||
// main: '@', // true if it's the user's main list
|
||||
// obj: '='
|
||||
//},
|
||||
link: function(scope, element, attrs) {
|
||||
// $scope.obj needs to come from controllers, so we can pass by ref
|
||||
scope.main = attrs.main;
|
||||
scope.modal = attrs.modal;
|
||||
var dailiesView;
|
||||
if(User.user.preferences.dailyDueDefaultView) {
|
||||
dailiesView = "remaining";
|
||||
} else {
|
||||
dailiesView = "all";
|
||||
}
|
||||
];
|
||||
$rootScope.lists = [
|
||||
{
|
||||
header: window.env.t('habits'),
|
||||
type: 'habit',
|
||||
placeHolder: window.env.t('newHabit'),
|
||||
placeHolderBulk: window.env.t('newHabitBulk'),
|
||||
view: "all"
|
||||
}, {
|
||||
header: window.env.t('dailies'),
|
||||
type: 'daily',
|
||||
placeHolder: window.env.t('newDaily'),
|
||||
placeHolderBulk: window.env.t('newDailyBulk'),
|
||||
view: dailiesView
|
||||
}, {
|
||||
header: window.env.t('todos'),
|
||||
type: 'todo',
|
||||
placeHolder: window.env.t('newTodo'),
|
||||
placeHolderBulk: window.env.t('newTodoBulk'),
|
||||
view: "remaining"
|
||||
}, {
|
||||
header: window.env.t('rewards'),
|
||||
type: 'reward',
|
||||
placeHolder: window.env.t('newReward'),
|
||||
placeHolderBulk: window.env.t('newRewardBulk'),
|
||||
view: "all"
|
||||
}
|
||||
];
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,30 +1,32 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('hrpgSortChecklist', hrpgSortChecklist);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('hrpgSortChecklist', hrpgSortChecklist);
|
||||
|
||||
hrpgSortChecklist.$inject = [
|
||||
'User'
|
||||
];
|
||||
hrpgSortChecklist.$inject = [
|
||||
'User'
|
||||
];
|
||||
|
||||
function hrpgSortChecklist(User) {
|
||||
return function($scope, element, attrs, ngModel) {
|
||||
$(element).sortable({
|
||||
axis: "y",
|
||||
distance: 5,
|
||||
start: function (event, ui) {
|
||||
ui.item.data('startIndex', ui.item.index());
|
||||
},
|
||||
stop: function (event, ui) {
|
||||
var task = angular.element(ui.item[0]).scope().task;
|
||||
var startIndex = ui.item.data('startIndex');
|
||||
$scope.swapChecklistItems(
|
||||
task,
|
||||
startIndex,
|
||||
ui.item.index()
|
||||
);
|
||||
}
|
||||
});
|
||||
function hrpgSortChecklist(User) {
|
||||
return function($scope, element, attrs, ngModel) {
|
||||
$(element).sortable({
|
||||
axis: "y",
|
||||
distance: 5,
|
||||
start: function (event, ui) {
|
||||
ui.item.data('startIndex', ui.item.index());
|
||||
},
|
||||
stop: function (event, ui) {
|
||||
var task = angular.element(ui.item[0]).scope().task;
|
||||
var startIndex = ui.item.data('startIndex');
|
||||
$scope.swapChecklistItems(
|
||||
task,
|
||||
startIndex,
|
||||
ui.item.index()
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,27 +1,29 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('hrpgSortTags', hrpgSortTags);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('hrpgSortTags', hrpgSortTags);
|
||||
|
||||
hrpgSortTags.$inject = [
|
||||
'User'
|
||||
];
|
||||
hrpgSortTags.$inject = [
|
||||
'User'
|
||||
];
|
||||
|
||||
function hrpgSortTags(User) {
|
||||
return function($scope, element, attrs, ngModel) {
|
||||
$(element).sortable({
|
||||
start: function (event, ui) {
|
||||
ui.item.data('startIndex', ui.item.index());
|
||||
},
|
||||
stop: function (event, ui) {
|
||||
User.user.ops.sortTag({
|
||||
query: {
|
||||
from: ui.item.data('startIndex'),
|
||||
to:ui.item.index()
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
function hrpgSortTags(User) {
|
||||
return function($scope, element, attrs, ngModel) {
|
||||
$(element).sortable({
|
||||
start: function (event, ui) {
|
||||
ui.item.data('startIndex', ui.item.index());
|
||||
},
|
||||
stop: function (event, ui) {
|
||||
User.user.ops.sortTag({
|
||||
query: {
|
||||
from: ui.item.data('startIndex'),
|
||||
to:ui.item.index()
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,32 +1,34 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('hrpgSortTasks', hrpgSortTasks);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('hrpgSortTasks', hrpgSortTasks);
|
||||
|
||||
hrpgSortTasks.$inject = [
|
||||
'User'
|
||||
];
|
||||
hrpgSortTasks.$inject = [
|
||||
'User'
|
||||
];
|
||||
|
||||
function hrpgSortTasks(User) {
|
||||
return function($scope, element, attrs, ngModel) {
|
||||
$(element).sortable({
|
||||
axis: "y",
|
||||
distance: 5,
|
||||
start: function (event, ui) {
|
||||
ui.item.data('startIndex', ui.item.index());
|
||||
},
|
||||
stop: function (event, ui) {
|
||||
var task = angular.element(ui.item[0]).scope().task;
|
||||
var startIndex = ui.item.data('startIndex');
|
||||
User.user.ops.sortTask({
|
||||
params: { id: task.id },
|
||||
query: {
|
||||
from: startIndex,
|
||||
to: ui.item.index()
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
function hrpgSortTasks(User) {
|
||||
return function($scope, element, attrs, ngModel) {
|
||||
$(element).sortable({
|
||||
axis: "y",
|
||||
distance: 5,
|
||||
start: function (event, ui) {
|
||||
ui.item.data('startIndex', ui.item.index());
|
||||
},
|
||||
stop: function (event, ui) {
|
||||
var task = angular.element(ui.item[0]).scope().task;
|
||||
var startIndex = ui.item.data('startIndex');
|
||||
User.user.ops.sortTask({
|
||||
params: { id: task.id },
|
||||
query: {
|
||||
from: startIndex,
|
||||
to: ui.item.index()
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,45 +1,47 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('popoverHtmlPopup', popoverHtmlPopup)
|
||||
.run(loadPopupTemplate);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('popoverHtmlPopup', popoverHtmlPopup)
|
||||
.run(loadPopupTemplate);
|
||||
|
||||
popoverHtmlPopup.$inject = [
|
||||
'$sce'
|
||||
];
|
||||
popoverHtmlPopup.$inject = [
|
||||
'$sce'
|
||||
];
|
||||
|
||||
function popoverHtmlPopup($sce) {
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&' },
|
||||
link: function(scope, element, attrs) {
|
||||
scope.$watch('content', function(value, oldValue) {
|
||||
scope.unsafeContent = $sce.trustAsHtml(scope.content);
|
||||
});
|
||||
},
|
||||
templateUrl: 'template/popover/popover-html.html'
|
||||
};
|
||||
}
|
||||
function popoverHtmlPopup($sce) {
|
||||
return {
|
||||
restrict: 'EA',
|
||||
replace: true,
|
||||
scope: { title: '@', content: '@', placement: '@', animation: '&', isOpen: '&' },
|
||||
link: function(scope, element, attrs) {
|
||||
scope.$watch('content', function(value, oldValue) {
|
||||
scope.unsafeContent = $sce.trustAsHtml(scope.content);
|
||||
});
|
||||
},
|
||||
templateUrl: 'template/popover/popover-html.html'
|
||||
};
|
||||
}
|
||||
|
||||
/*
|
||||
* TODO: Review whether it's appropriate to be seeding this into the
|
||||
* templateCache like this. Feel like this might be an antipattern?
|
||||
*/
|
||||
/*
|
||||
* TODO: Review whether it's appropriate to be seeding this into the
|
||||
* templateCache like this. Feel like this might be an antipattern?
|
||||
*/
|
||||
|
||||
loadPopupTemplate.$inject = [
|
||||
'$templateCache'
|
||||
];
|
||||
loadPopupTemplate.$inject = [
|
||||
'$templateCache'
|
||||
];
|
||||
|
||||
function loadPopupTemplate($templateCache) {
|
||||
$templateCache.put("template/popover/popover-html.html",
|
||||
"<div class=\"popover {{placement}}\" ng-class=\"{ in: isOpen(), fade: animation() }\">\n" +
|
||||
" <div class=\"arrow\"></div>\n" +
|
||||
"\n" +
|
||||
" <div class=\"popover-inner\">\n" +
|
||||
" <h3 class=\"popover-title\" ng-bind=\"title\" ng-show=\"title\"></h3>\n" +
|
||||
" <div class=\"popover-content\" ng-bind-html=\"unsafeContent\" style=\"word-wrap: break-word\"> </div>\n" +
|
||||
" </div>\n" +
|
||||
"</div>\n");
|
||||
}
|
||||
function loadPopupTemplate($templateCache) {
|
||||
$templateCache.put("template/popover/popover-html.html",
|
||||
"<div class=\"popover {{placement}}\" ng-class=\"{ in: isOpen(), fade: animation() }\">\n" +
|
||||
" <div class=\"arrow\"></div>\n" +
|
||||
"\n" +
|
||||
" <div class=\"popover-inner\">\n" +
|
||||
" <h3 class=\"popover-title\" ng-bind=\"title\" ng-show=\"title\"></h3>\n" +
|
||||
" <div class=\"popover-content\" ng-bind-html=\"unsafeContent\" style=\"word-wrap: break-word\"> </div>\n" +
|
||||
" </div>\n" +
|
||||
"</div>\n");
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('popoverHtml', popoverHtml);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('popoverHtml', popoverHtml);
|
||||
|
||||
popoverHtml.$inject = [
|
||||
'$compile',
|
||||
'$timeout',
|
||||
'$parse',
|
||||
'$window',
|
||||
'$tooltip'
|
||||
];
|
||||
popoverHtml.$inject = [
|
||||
'$compile',
|
||||
'$timeout',
|
||||
'$parse',
|
||||
'$window',
|
||||
'$tooltip'
|
||||
];
|
||||
|
||||
function popoverHtml($compile, $timeout, $parse, $window, $tooltip) {
|
||||
return $tooltip('popoverHtml', 'popover', 'click');
|
||||
}
|
||||
function popoverHtml($compile, $timeout, $parse, $window, $tooltip) {
|
||||
return $tooltip('popoverHtml', 'popover', 'click');
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,24 +1,26 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('taskFocus', taskFocus);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('taskFocus', taskFocus);
|
||||
|
||||
taskFocus.$inject = ['$timeout'];
|
||||
taskFocus.$inject = ['$timeout'];
|
||||
|
||||
/**
|
||||
* Directive that places focus on the element it is applied to when the
|
||||
* expression it binds to evaluates to true.
|
||||
*/
|
||||
/**
|
||||
* Directive that places focus on the element it is applied to when the
|
||||
* expression it binds to evaluates to true.
|
||||
*/
|
||||
|
||||
function taskFocus($timeout) {
|
||||
return function(scope, elem, attrs) {
|
||||
scope.$watch(attrs.taskFocus, function(newVal) {
|
||||
if (newVal) {
|
||||
$timeout(function() {
|
||||
elem[0].focus();
|
||||
}, 0, false);
|
||||
}
|
||||
});
|
||||
function taskFocus($timeout) {
|
||||
return function(scope, elem, attrs) {
|
||||
scope.$watch(attrs.taskFocus, function(newVal) {
|
||||
if (newVal) {
|
||||
$timeout(function() {
|
||||
elem[0].focus();
|
||||
}, 0, false);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}());
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
'use strict';
|
||||
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('whenScrolled', whenScrolled);
|
||||
(function(){
|
||||
angular
|
||||
.module('habitrpg')
|
||||
.directive('whenScrolled', whenScrolled);
|
||||
|
||||
function whenScrolled() {
|
||||
return function(scope, elm, attr) {
|
||||
var raw = elm[0];
|
||||
function whenScrolled() {
|
||||
return function(scope, elm, attr) {
|
||||
var raw = elm[0];
|
||||
|
||||
elm.bind('scroll', function() {
|
||||
if (raw.scrollTop + raw.offsetHeight >= raw.scrollHeight) {
|
||||
scope.$apply(attr.whenScrolled);
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
elm.bind('scroll', function() {
|
||||
if (raw.scrollTop + raw.offsetHeight >= raw.scrollHeight) {
|
||||
scope.$apply(attr.whenScrolled);
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
}());
|
||||
|
||||
Reference in New Issue
Block a user