Merge pull request #3 from yangit/master

Boilerplate update

require.js-example/app/main.js

@@ -16,5 +16,6 @@ requirejs.config({
 //Load array of modules (in this case 'app/module') into the variables (in this case module). "cs!" - means this file has to be parsed by cs plugin first.
 requirejs(['cs!app/module'], function (module) {
     //foo() is defined within module.coffee. We can use it within this callback.
+    //Note that we are passing lowercase here. But will get UPPERCASE because we use parentModule within module.
     module.foo('Hello!')
 });

require.js-example/app/module.coffee

@@ -6,10 +6,15 @@
     (F)->
       F(require, exports, module)
 )}).define (require, exports, module)->
-
   #Write your code here as usual
+
+  #I.e. require parent module
+  #NOTE: I did not figure out how to require coffee-script here. As this has to be both Node.js and require.js compatible syntax. And they disagree on how to do that. Anyway we can stick with .js parent modules for a while.
+  parent = require('./parentModule');
+
   module.exports =
   {
   foo: (message)->
-    alert message
+    #use parent module
+    alert parent.parentFoo message
   }

require.js-example/app/parentModule.js

@@ -0,0 +1,12 @@
+//this module is required to run module.
+({
+    define: (typeof define === "function" ? define : function (F) {
+        return F(require, exports, module);
+    })
+}).define(function (require, exports, module) {
+        return module.exports = {
+            parentFoo: function (message) {
+                return message.toUpperCase();
+            }
+        };
+    });

script/algos.coffee

@@ -5,6 +5,8 @@
     (F)->
       F(require, exports, module)
 )}).define (require, exports, module)->
+  helpers = require('./helpers')
+  moment = require('./moment')
   XP = 15
   HP = 2
   obj = module.exports =

script/helpers.js

@@ -1,53 +1,66 @@
-var dayMapping, moment;
+({
+    define: (typeof define === "function" ? define : function (F) {
+        return F(require, exports, module);
+    })
+}).define(function (require, exports, module) {
+        var dayMapping, moment;
+        module.exports = obj = {};
+        moment = require('./moment');
 
-moment = require('moment');
-
-exports.daysBetween = function(yesterday, now, dayStart) {
-    if (!((dayStart != null) && (dayStart = parseInt(dayStart)) && dayStart >= 0 && dayStart <= 24)) {
-        dayStart = 0;
-    }
-    return Math.abs(moment(yesterday).startOf('day').add('h', dayStart).diff(moment(now), 'days'));
-};
-
-exports.dayMapping = dayMapping = {
-    0: 'su',
-    1: 'm',
-    2: 't',
-    3: 'w',
-    4: 'th',
-    5: 'f',
-    6: 's',
-    7: 'su'
-};
-
-
-exports.equipped = function(user, type) {
-    var armor, armorSet, gender, head, _ref, _ref1, _ref2;
-    _ref = (user != null ? user.preferences : void 0) || {
-        'm': 'm',
-        'v1': 'v1'
-    }, gender = _ref.gender, armorSet = _ref.armorSet;
-    if (type === 'armor') {
-        armor = (user != null ? (_ref1 = user.items) != null ? _ref1.armor : void 0 : void 0) || 0;
-        if (gender === 'f') {
-            if (parseInt(armor) === 0) {
-                return "f_armor_" + armor + "_" + armorSet;
-            } else {
-                return "f_armor_" + armor;
+        obj.daysBetween = function (yesterday, now, dayStart) {
+            if (!((dayStart != null) && (dayStart = parseInt(dayStart)) && dayStart >= 0 && dayStart <= 24)) {
+                dayStart = 0;
             }
-        } else {
-            return "m_armor_" + armor;
-        }
-    } else if (type === 'head') {
-        head = (user != null ? (_ref2 = user.items) != null ? _ref2.head : void 0 : void 0) || 0;
-        if (gender === 'f') {
-            if (parseInt(head) > 1) {
-                return "f_head_" + head + "_" + armorSet;
-            } else {
-                return "f_head_" + head;
+            return Math.abs(moment(yesterday).startOf('day').add('h', dayStart).diff(moment(now), 'days'));
+        };
+
+        obj.dayMapping = dayMapping = {
+            0: 'su',
+            1: 'm',
+            2: 't',
+            3: 'w',
+            4: 'th',
+            5: 'f',
+            6: 's',
+            7: 'su'
+        };
+
+
+        obj.equipped = function (user, type) {
+            var armor, armorSet, gender, head, _ref, _ref1, _ref2;
+            _ref = (user != null ? user.preferences : void 0) || {
+                'm': 'm',
+                'v1': 'v1'
+            }, gender = _ref.gender, armorSet = _ref.armorSet;
+            if (type === 'armor') {
+                armor = (user != null ? (_ref1 = user.items) != null ? _ref1.armor : void 0 : void 0) || 0;
+                if (gender === 'f') {
+                    if (parseInt(armor) === 0) {
+                        return "f_armor_" + armor + "_" + armorSet;
+                    } else {
+                        return "f_armor_" + armor;
+                    }
+                } else {
+                    return "m_armor_" + armor;
+                }
+            } else if (type === 'head') {
+                head = (user != null ? (_ref2 = user.items) != null ? _ref2.head : void 0 : void 0) || 0;
+                if (gender === 'f') {
+                    if (parseInt(head) > 1) {
+                        return "f_head_" + head + "_" + armorSet;
+                    } else {
+                        return "f_head_" + head;
+                    }
+                } else {
+                    return "m_head_" + head;
+                }
             }
-        } else {
-            return "m_head_" + head;
-        }
-    }
-};
+        };
+        return obj;
+    });
+
+
+
+
+
+