lefnire

# Aggregate all intrinsic stats, buffs, weapon, & armor into computed stats
Object.defineProperty user, '_statsComputed',
  get: ->
    _.reduce(['per','con','str','int'], (m,stat) =>
      m[stat] = _.reduce('stats stats.buffs items.gear.current.weapon items.gear.current.armor items.gear.current.head items.gear.current.shield'.split(' '), (m2,path) =>
        val = helpers.dotGet(path, @)
        m2 +
          if ~path.indexOf('items.gear')
            # get the gear stat, and multiply it by 1.2 if it's class-gear
            (+items.items.gear.flat[val]?[stat] or 0) * (if ~val?.indexOf(@stats.class) then 1.2 else 1)

lefnire

TagSchema = {
 _id: {type: String, 'default': helpers.uuid}
 name: String,
 tags: [TagSchema]
}

UserSchema = {
 ...
 tags: [TagSchema],
 ...

lefnire

diff --git a/README.md b/README.md
index b466355..41f8af7 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,7 @@
 # Translations - WIP
 
-Some files has been overwriteen after merging with develop, will revisit later:
-
-- locales/nl/app.json

lefnire

diff --git a/views/index.jade b/views/index.jade
index 1c4104e..1563ed8 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -11,7 +11,7 @@ html
 
     style.
       [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-        display: none;
+        display: none !important;

lefnire

diff --git a/app/scripts/controllers/RootCtrl.js b/app/scripts/controllers/RootCtrl.js
index ec465f5..1e855cd 100644
--- a/app/scripts/controllers/RootCtrl.js
+++ b/app/scripts/controllers/RootCtrl.js
@@ -11,6 +11,7 @@ habitrpg.controller('RootCtrl',
 
     // FIXME this is dangerous, organize helpers.coffee better, so we can group them by which controller needs them,
     // and then simply _.defaults($scope, Helpers.user) kinda thing
+    _.defaults($rootScope, window.habitrpgShared.algos);
     _.defaults($rootScope, window.habitrpgShared.helpers);

lefnire

diff --git a/app/index.html b/app/index.html
index 5248348..d6ee686 100644
--- a/app/index.html
+++ b/app/index.html
@@ -31,7 +31,7 @@
 
             <nav class="menu" ng-class="{open : menuopen}" style="top:0; left:0; width:100%">
                 <div class="navLinkBlock">
-                    <a class="mainNavLink" ng-repeat="button in nav" ng-click="menuopen != menuopen" href="#{{button.link}}">{{button.name}}</a>
+                    <a class="mainNavLink" ng-repeat="button in nav" ng-click="menuClick(button)">{{button.name}}</a>

lefnire

cp -R old/.git new
cd new
git branch angular && git checkout angular
git add . && git add -u .
git commit -am 'initial port to angular'

lefnire

/Users/lefnire/Dropbox/Sites/personal/gethuman/gh/ghweb.client/test/config
INFO [karma]: Karma server started at http://localhost:9201/
INFO [launcher]: Starting browser PhantomJS
INFO [karma]: To run via this server, use "karma run --runner-port 9301"
INFO [PhantomJS 1.8 (Mac)]: Connected on socket id pCJ4CxjYJMrC0XlN5nvl
PhantomJS 1.8 (Mac) UNIT ghweb.client/app/common/services/api.client.service should make a basic GET call FAILED
  TypeError: 'undefined' is not an object (evaluating '$http(apiOpts).then')
	    at /Users/lefnire/Dropbox/Sites/personal/gethuman/gh/ghweb.client/app/common/services/api.client.service.js:6
	    at /Users/lefnire/Dropbox/Sites/personal/gethuman/gh/ghweb.client/app/common/services/api.client.service.js:6
	    at /Users/lefnire/Dropbox/Sites/personal/gethuman/gh/ghweb.client/test/unit/common/services/test.api.client.service.js:31

lefnire

The page at https://habitrpg.com/ displayed insecure content from http://gravatar.com/avatar/df4db71ebcf832a102fd42e40ac291a7?s=64.
 habitrpg.com/:2
The page at https://habitrpg.com/ displayed insecure content from http://www.gravatar.com/avatar/00752d9d23f789835a46ecb42fb6b6a7.png.
 habitrpg.com/:3
The page at https://habitrpg.com/ displayed insecure content from http://graphics.tudelft.nl/People/NoeskaSmit?action=AttachFile&do=get&target=noeskas.jpg.
 habitrpg.com/:3
The page at https://habitrpg.com/ displayed insecure content from http://www.mamamia.com.au/wp-content/uploads/2011/07/a-snoopy-day-at-work.jpg.
 habitrpg.com/:3
The page at https://habitrpg.com/ displayed insecure content from http://i.imgur.com/tmAI6.png.
 habitrpg.com/:14

lefnire

Trace: Invalid version
    at /var/www/vhosts/habitrpg.com/releases/4d5e1dd83970b80b898d1f5535fe458ec60228ea/node_modules/derby/node_modules/racer/node_modules/share/lib/server/session.js:459:19
    at /var/www/vhosts/habitrpg.com/releases/4d5e1dd83970b80b898d1f5535fe458ec60228ea/node_modules/derby/node_modules/racer/node_modules/share/lib/server/useragent.js:184:23
    at /var/www/vhosts/habitrpg.com/releases/4d5e1dd83970b80b898d1f5535fe458ec60228ea/node_modules/derby/node_modules/racer/node_modules/share/node_modules/livedb/lib/index.js:147:53
    at /var/www/vhosts/habitrpg.com/releases/4d5e1dd83970b80b898d1f5535fe458ec60228ea/node_modules/derby/node_modules/racer/node_modules/share/node_modules/livedb/lib/index.js:373:18
    at /var/www/vhosts/habitrpg.com/releases/4d5e1dd83970b80b898d1f5535fe458ec60228ea/node_modules/derby/node_modules/racer/node_modules/share/node_modules/livedb/lib/index.js:123:16
    at try_callback (/var/www/vhosts/habitrpg.com/releases/4d5e1dd83970b80b898d1f5535fe458ec60228ea/node_m