Adds tags; fixes problem in op.

diff --git a/src/Y/op.cjs b/src/Y/op.cjs
index e621efa..e52348b 100644 (file)
--- a/src/Y/op.cjs
+++ b/src/Y/op.cjs
@@ -49,7 +49,7 @@ var core = require('Y/core')
     khas:    function(k,o){     return k in o; },
     kget:    function(k,o){     return o[k] },
     defkget: function(def,k,o){ return (k in o ? o[k] : def); },
-    vkset:   function(o,v,k){   if (o && k !== undefined) o[k] = v; return o; },
+    vkset:   function(o,v,k){   if (o && k !== undefined){ o[k] = v; } return o; },
     
     // curry-ordered values & accessors
     has:     function(o,k){     return k in o; },
@@ -76,4 +76,4 @@ function extender(target, donor){
     return core.reduce(donor, op.vkset, target);
 }
 
-core.extend(exports, op);
+op.extend(exports, op);

diff --git a/src/Y/utils.cjs b/src/Y/utils.cjs
index 9886733..6afbee3 100644 (file)
--- a/src/Y/utils.cjs
+++ b/src/Y/utils.cjs
@@ -30,9 +30,9 @@ var defaults = {
     'wrap'     : false,
     'chain'    : false
 };
-function mixin(target, options){
+function mixin(o, options){
     var opt    = op.extend({}, defaults, options), Donor = opt.donor
-    ,   target = ( isFunction(target) ? target.prototype : target )
+    ,   target = ( isFunction(o)      ? o.prototype      : o )
     ,   proto  = ( isFunction(Donor)  ? Donor.prototype  : Donor  )
     ,   names  = opt.names
     ;

diff --git a/src/tanks/index.cjs b/src/tanks/index.js
similarity index 94%
rename from src/tanks/index.cjs
rename to src/tanks/index.js
index 651be7c..deeb351 100644 (file)
--- a/src/tanks/index.cjs
+++ b/src/tanks/index.js
@@ -24,3 +24,6 @@ if (!window.console) {
         debug : Y.op.nop
     };
 }
+
+jQuery(tanks.ui.main.main);
+

diff --git a/src/tanks/ui/main.cjs b/src/tanks/ui/main.cjs
index 6924f9c..19080f0 100644 (file)
--- a/src/tanks/ui/main.cjs
+++ b/src/tanks/ui/main.cjs
@@ -11,11 +11,10 @@ var Y            = require('Y').Y
 
 qkv = Y(window.location.search.slice(1)).fromKV().end();
 
-jQuery(main);
-
 // Main method is only executed once, so we'll setup things
 // that don't change between games.
 function main(){
+    console.log('main!');
     
     /// Debug ///
     if (qkv.ai) {

diff --git a/tags.html b/tags.html
new file mode 100644 (file)
index 0000000..a988a4f
--- /dev/null
+++ b/tags.html
@@ -0,0 +1,61 @@
+<script src="build/require.js" type="text/javascript"></script>
+<script src="build/future.js" type="text/javascript"></script>
+<script src="build/functional/to-function.js" type="text/javascript"></script>
+<script src="build/Y/type.js" type="text/javascript"></script>
+<script src="build/Y/core.js" type="text/javascript"></script>
+<script src="build/Y/y.js" type="text/javascript"></script>
+<script src="build/Y/types/function.js" type="text/javascript"></script>
+<script src="build/Y/op.js" type="text/javascript"></script>
+<script src="build/Y/utils.js" type="text/javascript"></script>
+<script src="build/Y/class.js" type="text/javascript"></script>
+<script src="build/Y/types/collection.js" type="text/javascript"></script>
+<script src="build/Y/types/string.js" type="text/javascript"></script>
+<script src="build/Y/types/array.js" type="text/javascript"></script>
+<script src="build/Y/types/object.js" type="text/javascript"></script>
+<script src="build/Y/types/number.js" type="text/javascript"></script>
+<script src="build/Y.js" type="text/javascript"></script>
+<script src="build/jquery.js" type="text/javascript"></script>
+<script src="build/jquery.sparkline.min.js" type="text/javascript"></script>
+<script src="build/Y/modules/y.event.js" type="text/javascript"></script>
+<script src="build/ezl/util.js" type="text/javascript"></script>
+<script src="build/ezl/loop/fps.js" type="text/javascript"></script>
+<script src="build/ezl/math/vec.js" type="text/javascript"></script>
+<script src="build/ezl/loop/cooldown.js" type="text/javascript"></script>
+<script src="build/ezl/loop/eventloop.js" type="text/javascript"></script>
+<script src="build/ezl/loc/loc.js" type="text/javascript"></script>
+<script src="build/ezl/math/rect.js" type="text/javascript"></script>
+<script src="build/ezl/math/line.js" type="text/javascript"></script>
+<script src="build/ezl/loop.js" type="text/javascript"></script>
+<script src="build/ezl/math.js" type="text/javascript"></script>
+<script src="build/ezl/loc/boundingbox.js" type="text/javascript"></script>
+<script src="build/ezl/loc/square.js" type="text/javascript"></script>
+<script src="build/ezl/loc.js" type="text/javascript"></script>
+<script src="build/ezl/layer.js" type="text/javascript"></script>
+<script src="build/ezl/shape/shape.js" type="text/javascript"></script>
+<script src="build/ezl/shape/line.js" type="text/javascript"></script>
+<script src="build/ezl/shape/polygon.js" type="text/javascript"></script>
+<script src="build/ezl/shape/circle.js" type="text/javascript"></script>
+<script src="build/ezl/shape/rect.js" type="text/javascript"></script>
+<script src="build/ezl/shape.js" type="text/javascript"></script>
+<script src="build/ezl.js" type="text/javascript"></script>
+<script src="build/jquery.hotkeys.min.js" type="text/javascript"></script>
+<script src="build/tanks/globals.js" type="text/javascript"></script>
+<script src="build/evt/class.js" type="text/javascript"></script>
+<script src="build/tanks/config.js" type="text/javascript"></script>
+<script src="build/ezl/util/tree/quadtree.js" type="text/javascript"></script>
+<script src="build/tanks/ui/config.js" type="text/javascript"></script>
+<script src="build/tanks/map/pathmap.js" type="text/javascript"></script>
+<script src="build/tanks/thing/thing.js" type="text/javascript"></script>
+<script src="build/tanks/map/trajectory.js" type="text/javascript"></script>
+<script src="build/tanks/map/wall.js" type="text/javascript"></script>
+<script src="build/tanks/ui/grid.js" type="text/javascript"></script>
+<script src="build/tanks/thing/bullet.js" type="text/javascript"></script>
+<script src="build/tanks/thing/tank.js" type="text/javascript"></script>
+<script src="build/tanks/thing/player.js" type="text/javascript"></script>
+<script src="build/tanks/map/level.js" type="text/javascript"></script>
+<script src="build/tanks/thing.js" type="text/javascript"></script>
+<script src="build/tanks/map.js" type="text/javascript"></script>
+<script src="build/tanks/game.js" type="text/javascript"></script>
+<script src="build/tanks/ui/main.js" type="text/javascript"></script>
+<script src="build/tanks/ui.js" type="text/javascript"></script>
+<script src="build/tanks.js" type="text/javascript"></script>

diff --git a/tanks.php b/tanks.php
index 3858af2..cdcb047 100644 (file)
--- a/tanks.php
+++ b/tanks.php
@@ -106,16 +106,16 @@ class Tanks {
         error_reporting(E_ALL);
         echo "<!--";
         foreach ($modules as $module) {
-            $ret = shell_exec("$PYTHONPATH bin/cjs.py {$module['main']} -- src lib 2>&1"); //
-            echo "    ".trim(join("\n    ", split("\n", $ret)));
+            $ret = shell_exec("$PYTHONPATH commonjs src/tanks 2>&1"); //
+            echo "    ".trim(join("\n    ", explode("\n", $ret)));
         }
         echo "-->";
-        include "tags.php";
+        include "build/tags.html";
     }
     
     static function writeLoaders($modules=null, $recompile=true){
         $modules = ($modules ? $modules : self::$modules);
-        js('lib/cjs/require.js');
+        // js('lib/cjs/require.js');
         if ($recompile) Tanks::compile($modules);
         // foreach ($modules as $module) js($module['loader'], Tanks::BUILD_DIR."/");
     }