Skip to content

Commit

Permalink
pre23
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronblohowiak committed Aug 27, 2011
1 parent 3f14a6b commit 9601aea
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 11 deletions.
2 changes: 1 addition & 1 deletion browser/render_context.js
Expand Up @@ -15,7 +15,7 @@ module.exports = RenderContext = function (templates){
context.renderLive = function(tetherName, templateName, obj){
var data = this.data;

data.subscribe.push(obj.id);
data.subscribe.push(obj.id.toString());
data.objectsReferenced[obj.id] = obj;

var binding = ViewBinding(templateName, obj.id, tetherName);
Expand Down
15 changes: 11 additions & 4 deletions browser/transitive.js
Expand Up @@ -36,14 +36,21 @@ Transitive.boot = function(){
});

this.pushIt.onMessageReceived = function(message){
Transitive.emit(message.channel, message);
Transitive.emit(message.channel, message.data);
};
};

function initViewBinding(viewBinding) {
viewBinding.element = document.getElementById(viewBinding.elmId);
this.on(viewBinding.objId, function(data){
Transitive.templates.liveRenders[viewBinding.liveRenderName].update.call(binding, data);
var liveRender = Transitive.Views.templates.liveRenders[viewBinding.liveRenderName];

viewBinding.element = $(document.getElementById(viewBinding.elmId));

if(liveRender.hasOwnProperty("init")){
liveRender.init.call(viewBinding, $pageData.objectsReferenced[viewBinding.objId]);
}

Transitive.on(viewBinding.objId, function(data){
liveRender.update.call(viewBinding, data);
});
}
module.exports = Transitive;
2 changes: 1 addition & 1 deletion lib/transitive.js
Expand Up @@ -69,7 +69,7 @@ Tx.loadOptions = function(options){
options.mergeDefault = "mergeDefault" in options ? options.mergeDefault : true;

if(options.mergeDefault){
options = merge(defaultOptions, options);
options = merge(defaultOptions, options);
}

if(!options.root){
Expand Down
6 changes: 6 additions & 0 deletions lib/views/compile.js
Expand Up @@ -40,12 +40,18 @@ function compileLiveRenders(options, templates){
var liveRender;
var liveRenders = {};

var cwd = process.cwd();
// process.chdir(options.directories.liveRenders);

_.forEach(filenames, function(filename){
filename = path.resolve(filename);
console.log(filename)
liveRender = require(filename);
liveRenders[liveRender.name] = liveRender;
addLiveRenderTemplatesToMainTemplates(templates, liveRender.templates, filename);
});

process.chdir(cwd);
return liveRenders;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/views/render_context.js
Expand Up @@ -18,8 +18,8 @@ module.exports = RenderContext = function (templates){
var binding = ViewBinding(templateName, obj.id, liveRenderName);
data.bindings.push(binding);

data.subscribe.push(obj.id);
data.objectsReferenced[obj.id] = obj;
data.subscribe.push(obj.id.toString());
data.objectsReferenced[obj.id.toString()] = obj;

var output = '<div id="'+binding.elmId+'" class="'+liveRenderName+'">';
output = output + this.liveRenders[liveRenderName].prepare.call(this, templateName, obj);
Expand Down
6 changes: 3 additions & 3 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "transitive",
"description": "very rough version. please ignore",
"version": "0.0.0pre22",
"version": "0.0.0pre23",
"repository": "git://github.com/Transitive/Transitive.git",
"author": "Aaron Blohowiak <aaron.blohowiak@gmail.com>",
"directories": {
Expand All @@ -15,7 +15,7 @@
"markdown":"0.2.1"
},
"dependencies": {
"push-it": "0.0.2",
"push-it": "0.0.3",
"shared-views": "0.7.1",
"uuid-pure": "1.0.10",
"connect":"1.4.1",
Expand All @@ -25,4 +25,4 @@
},
"bin": {"transitive" : "./cli.js"},
"dont_announce": true
}
}

0 comments on commit 9601aea

Please sign in to comment.