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

chore(dependency): Upgrade lodash from v2 to v3

Browse Source
This commit is contained in:
Blade Barringer
2015-12-26 08:18:58 -06:00
parent 33714b4947
commit b3050e5a67
15 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/public/js/services/guideServices.js
View File

@@ -184,7 +184,7 @@ function($rootScope, User, $timeout, $state, Analytics) {
}
_.each(chapters, function(chapter, k){
_(chapter).flatten().each(function(step, i) {
_(chapter).flattenDeep().each(function(step, i) {
step.content = "<div><div class='" + (env.worldDmg.guide ? "npc_justin_broken" : "npc_justin") + " float-left'></div>" + step.content + "</div>";
$(step.element).popover('destroy'); // destroy existing hover popovers so we can add our own
step.onShow = function(){
@@ -209,7 +209,7 @@ function($rootScope, User, $timeout, $state, Analytics) {
}
User.set(ups);
}
})
}).value();
});
var tour = {};
@@ -226,7 +226,7 @@ function($rootScope, User, $timeout, $state, Analytics) {
'<h3 class="popover-title"></h3>' +
'<div class="popover-content"></div>' +
'<div class="popover-navigation"> ' +
(showCounter ? '<span style="float:right;">'+ (i+1 +' of '+ _.flatten(chapters[k]).length) +'</span>' : '')+ // counter
(showCounter ? '<span style="float:right;">'+ (i+1 +' of '+ _.flattenDeep(chapters[k]).length) +'</span>' : '')+ // counter
'<div class="btn-group">' +
(step.hideNavigation ? '' : '<button class="btn btn-sm btn-default" data-role="prev">&laquo; Previous</button>') +
(showFinish ? ('<button class="btn btn-sm btn-primary" data-role="end" style="float:none;">' + (step.proceed ? step.proceed : "Finish Tour") + '</button>') :