joosy 1.2.0.alpha.38 → 1.2.0.alpha.41

data/lib/joosy.js

@@ -56,27 +56,6 @@ this.Joosy = {
       return v.toString(16);
     }).toUpperCase();
   },
-  preloadImages: function(images, callback) {
-    var checker, p, result, ticks, _i, _len;
-    if (!Object.isArray(images)) {
-      images = [images];
-    }
-    if (images.length === 0) {
-      callback();
-    }
-    ticks = images.length;
-    result = [];
-    checker = function() {
-      if ((ticks -= 1) === 0) {
-        return typeof callback === "function" ? callback() : void 0;
-      }
-    };
-    for (_i = 0, _len = images.length; _i < _len; _i++) {
-      p = images[_i];
-      result.push($('<img/>').load(checker).error(checker).attr('src', p));
-    }
-    return result;
-  },
   buildUrl: function(url, params) {
     var hash, paramsString;
     paramsString = [];
@@ -130,16 +109,21 @@ this.Joosy.Module = (function() {
     return false;
   };
 
-  Module.alias = function(method, feature, action) {
-    var chained;
-    chained = "" + method + "Without" + (feature.camelize());
+  Module.aliasMethodChain = function(method, feature, action) {
+    var camelized, chained;
+    camelized = feature.charAt(0).toUpperCase() + feature.slice(1);
+    chained = "" + method + "Without" + camelized;
+    if (!Object.isFunction(action)) {
+      action = this.prototype[action];
+    }
     this.prototype[chained] = this.prototype[method];
     return this.prototype[method] = action;
   };
 
-  Module.aliasStatic = function(method, feature, action) {
-    var chained;
-    chained = "" + method + "Without" + (feature.camelize());
+  Module.aliasStaticMethodChain = function(method, feature, action) {
+    var camelized, chained;
+    camelized = feature.charAt(0).toUpperCase() + feature.slice(1);
+    chained = "" + method + "Without" + camelized;
     this[chained] = this[method];
     return this[method] = action;
   };
@@ -220,15 +204,12 @@ Joosy.Application = {
       this.mergeConfig(window.JoosyEnvironment);
     }
     this.mergeConfig(options);
-    this.templater = new Joosy.Templaters.RailsJST(this.name);
+    this.templater = new Joosy.Templaters.JST(this.name);
     return Joosy.Router.__setupRoutes();
   },
   content: function() {
     return $(this.selector);
   },
-  sandbox: function() {
-    return $(this.sandboxSelector);
-  },
   setCurrentPage: function(page, params) {
     var attempt;
     attempt = new page(params, this.page);
@@ -293,21 +274,17 @@ Joosy.helpers('Application', function() {
 /***  src/joosy/core/helpers/widgets  ***/
 
 Joosy.helpers('Application', function() {
-  return this.widget = function(element, widget) {
-    var params, parts, uuid;
-    uuid = Joosy.uuid();
-    params = {
-      id: uuid
-    };
-    parts = element.split('.');
-    if (parts[1]) {
-      params["class"] = parts.from(1).join(' ');
+  return this.widget = function(tag, options, widget) {
+    var _this = this;
+    if (widget == null) {
+      widget = options;
+      options = {};
     }
-    element = this.tag(parts[0], params);
-    this.onRefresh(function() {
-      return this.registerWidget('#' + uuid, widget);
+    options.id = Joosy.uid();
+    this.__renderer.setTimeout(0, function() {
+      return _this.__renderer.registerWidget($('#' + options.id), widget);
     });
-    return element;
+    return this.tag(tag, options);
   };
 });
 
@@ -362,11 +339,12 @@ Joosy.Modules.Events = {
       events = name;
       name = Object.keys(this.__oneShotEvents).length.toString();
     }
-    events = this.__splitEvents(events);
-    this.__validateEvents(events);
-    this.__oneShotEvents[name] = [events, callback];
+    this.__oneShotEvents[name] = [this.__splitEvents(events), callback];
     return name;
   },
+  unwait: function(target) {
+    return delete this.__oneShotEvents[target];
+  },
   bind: function(name, events, callback) {
     this.__boundEvents || (this.__boundEvents = {});
     if (Object.isFunction(events)) {
@@ -374,25 +352,11 @@ Joosy.Modules.Events = {
       events = name;
       name = Object.keys(this.__boundEvents).length.toString();
     }
-    events = this.__splitEvents(events);
-    this.__validateEvents(events);
-    this.__boundEvents[name] = [events, callback];
+    this.__boundEvents[name] = [this.__splitEvents(events), callback];
     return name;
   },
   unbind: function(target) {
-    var callback, events, name, needle, _ref, _ref1;
-    needle = void 0;
-    _ref = this.__boundEvents;
-    for (name in _ref) {
-      _ref1 = _ref[name], events = _ref1[0], callback = _ref1[1];
-      if ((Object.isFunction(target) && callback === target) || name === target) {
-        needle = name;
-        break;
-      }
-    }
-    if (needle != null) {
-      return delete this.__boundEvents[needle];
-    }
+    return delete this.__boundEvents[target];
   },
   trigger: function() {
     var callback, data, event, events, fire, name, _ref, _ref1, _ref2, _ref3, _results,
@@ -450,76 +414,72 @@ Joosy.Modules.Events = {
   __splitEvents: function(events) {
     if (Object.isString(events)) {
       if (events.isBlank()) {
-        return [];
+        events = [];
       } else {
-        return events.trim().split(/\s+/);
+        events = events.trim().split(/\s+/);
       }
-    } else {
-      return events;
     }
-  },
-  __validateEvents: function(events) {
     if (!(Object.isArray(events) && events.length > 0)) {
       throw new Error("" + (Joosy.Module.__className(this)) + "> bind invalid events: " + events);
     }
+    return events;
   }
 };
 
-Joosy.Events = {};
-
-Joosy.Events.Namespace = (function() {
-  function Namespace(parent) {
-    this.parent = parent;
-    this.bindings = [];
-  }
-
-  Namespace.prototype.bind = function() {
-    var args, _ref;
-    args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-    return this.bindings.push((_ref = this.parent).bind.apply(_ref, args));
-  };
-
-  Namespace.prototype.unbind = function() {
-    var b, _i, _len, _ref;
-    _ref = this.bindings;
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      b = _ref[_i];
-      this.parent.unbind(b);
+Joosy.namespace('Joosy.Events', function() {
+  this.Namespace = (function() {
+    function Namespace(parent) {
+      this.parent = parent;
+      this.bindings = [];
     }
-    return this.bindings = [];
-  };
 
-  return Namespace;
+    Namespace.prototype.bind = function() {
+      var args, _ref;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return this.bindings.push((_ref = this.parent).bind.apply(_ref, args));
+    };
 
-})();
+    Namespace.prototype.unbind = function() {
+      var b, _i, _len, _ref;
+      _ref = this.bindings;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        b = _ref[_i];
+        this.parent.unbind(b);
+      }
+      return this.bindings = [];
+    };
 
-Joosy.Events.SynchronizationContext = (function() {
-  SynchronizationContext.uid = 0;
+    return Namespace;
 
-  function SynchronizationContext(parent) {
-    this.parent = parent;
-    this.expectations = [];
-    this.actions = [];
-  }
+  })();
+  return this.SynchronizationContext = (function() {
+    SynchronizationContext.uid = 0;
 
-  SynchronizationContext.prototype.uid = function() {
-    return this.constructor.uid += 1;
-  };
+    function SynchronizationContext(parent) {
+      this.parent = parent;
+      this.expectations = [];
+      this.actions = [];
+    }
 
-  SynchronizationContext.prototype["do"] = function(action) {
-    var event;
-    event = "synchro-" + (this.uid());
-    this.expectations.push(event);
-    return this.actions.push([action, event]);
-  };
+    SynchronizationContext.prototype.uid = function() {
+      return this.constructor.uid += 1;
+    };
 
-  SynchronizationContext.prototype.after = function(after) {
-    this.after = after;
-  };
+    SynchronizationContext.prototype["do"] = function(action) {
+      var event;
+      event = "synchro-" + (this.uid());
+      this.expectations.push(event);
+      return this.actions.push([action, event]);
+    };
 
-  return SynchronizationContext;
+    SynchronizationContext.prototype.after = function(after) {
+      this.after = after;
+    };
 
-})();
+    return SynchronizationContext;
+
+  })();
+});
 
 
 /***  src/joosy/core/modules/container  ***/
@@ -540,31 +500,9 @@ Joosy.Modules.Container = {
       return Object.merge(this.prototype.__events, map);
     };
   },
-  onRefresh: function(callback) {
-    if (!this.hasOwnProperty("__onRefreshes")) {
-      this.__onRefreshes = [];
-    }
-    return this.__onRefreshes.push(callback);
-  },
   $: function(selector) {
     return $(selector, this.container);
   },
-  refreshElements: function() {
-    var _this = this;
-    if (this.hasOwnProperty("__onRefreshes")) {
-      this.__onRefreshes.each(function(callback) {
-        return callback.apply(_this);
-      });
-      return this.__onRefreshes = [];
-    }
-  },
-  reloadContainer: function(htmlCallback) {
-    if (typeof this.__removeMetamorphs === "function") {
-      this.__removeMetamorphs();
-    }
-    this.container.html(htmlCallback());
-    return this.refreshElements();
-  },
   swapContainer: function(container, data) {
     container.unbind().off();
     container.html(data);
@@ -586,26 +524,33 @@ Joosy.Modules.Container = {
     return selector.trim();
   },
   __assignElements: function(root, entries) {
-    var _this = this;
+    var key, value, _results;
     root || (root = this);
     entries || (entries = this.__elements);
     if (!entries) {
       return;
     }
-    return Object.each(entries, function(key, value) {
+    _results = [];
+    for (key in entries) {
+      value = entries[key];
       if (Object.isObject(value)) {
-        return _this.__assignElements(root['$' + key] = {}, value);
+        _results.push(this.__assignElements(root['$' + key] = {}, value));
       } else {
-        value = _this.__extractSelector(value);
-        root['$' + key] = function(filter) {
-          if (!filter) {
-            return _this.$(value);
-          }
-          return _this.$(value).filter(filter);
-        };
-        return root['$' + key].selector = value;
+        value = this.__extractSelector(value);
+        root['$' + key] = this.__wrapElement(value);
+        _results.push(root['$' + key].selector = value);
       }
-    });
+    }
+    return _results;
+  },
+  __wrapElement: function(value) {
+    var _this = this;
+    return function(filter) {
+      if (!filter) {
+        return _this.$(value);
+      }
+      return _this.$(value).filter(filter);
+    };
   },
   __delegateEvents: function() {
     var events, module,
@@ -640,31 +585,33 @@ Joosy.Modules.Container = {
 };
 
 
-/***  src/joosy/core/templaters/rails_jst  ***/
+/***  src/joosy/core/templaters/jst  ***/
 
-Joosy.Templaters.RailsJST = (function() {
-  function RailsJST(applicationName) {
-    this.applicationName = applicationName;
+Joosy.Templaters.JST = (function() {
+  function JST(applicationName) {
+    if (Object.isString(applicationName) && applicationName.length > 0) {
+      this.applicationName = applicationName;
+    }
   }
 
-  RailsJST.prototype.buildView = function(name) {
-    var haystack, template;
+  JST.prototype.buildView = function(name) {
+    var haystack, path, template, _i, _len;
     template = false;
-    haystack = ["" + this.applicationName + "/templates/" + name + "-" + (typeof I18n !== "undefined" && I18n !== null ? I18n.locale : void 0), "" + this.applicationName + "/templates/" + name, "templates/" + name + "-" + (typeof I18n !== "undefined" && I18n !== null ? I18n.locale : void 0), "templates/" + name];
-    haystack.each(function(path) {
-      var location;
-      if (JST[path]) {
-        location = path;
-        return template = JST[path];
+    if (this.applicationName) {
+      haystack = ["" + this.applicationName + "/templates/" + name + "-" + (typeof I18n !== "undefined" && I18n !== null ? I18n.locale : void 0), "" + this.applicationName + "/templates/" + name];
+    } else {
+      haystack = ["templates/" + name + "-" + (typeof I18n !== "undefined" && I18n !== null ? I18n.locale : void 0), "templates/" + name];
+    }
+    for (_i = 0, _len = haystack.length; _i < _len; _i++) {
+      path = haystack[_i];
+      if (window.JST[path]) {
+        return window.JST[path];
       }
-    });
-    if (!template) {
-      throw new Error("Template '" + name + "' not found. Checked at: " + location);
     }
-    return template;
+    throw new Error("Template '" + name + "' not found. Checked at: '" + (haystack.join(', ')) + "'");
   };
 
-  RailsJST.prototype.resolveTemplate = function(section, template, entity) {
+  JST.prototype.resolveTemplate = function(section, template, entity) {
     var path, _ref, _ref1;
     if (template.startsWith('/')) {
       return template.substr(1);
@@ -674,7 +621,7 @@ Joosy.Templaters.RailsJST = (function() {
     return "" + (path.join('/')) + "/" + template;
   };
 
-  return RailsJST;
+  return JST;
 
 })();
 
@@ -1062,80 +1009,35 @@ Joosy.Templaters.RailsJST = (function() {
 var __slice = [].slice;
 
 Joosy.Modules.Renderer = {
-  __renderer: function() {
+  __renderDefault: function() {
     throw new Error("" + (Joosy.Module.__className(this.constructor)) + " does not have an attached template");
   },
-  __helpers: null,
   included: function() {
     this.view = function(template, options) {
       if (options == null) {
         options = {};
       }
-      if (Object.isFunction(template)) {
-        return this.prototype.__renderer = template;
-      } else {
-        return this.prototype.__renderer = function(locals) {
-          if (locals == null) {
-            locals = {};
-          }
-          if (options.dynamic) {
-            return this.renderDynamic(template, locals);
-          } else {
-            return this.render(template, locals);
-          }
-        };
-      }
+      return this.prototype.__renderDefault = function(locals) {
+        if (locals == null) {
+          locals = {};
+        }
+        if (options.dynamic) {
+          return this.renderDynamic(template, locals);
+        } else {
+          return this.render(template, locals);
+        }
+      };
     };
-    return this.helpers = function() {
-      var helpers, _base,
-        _this = this;
+    return this.helper = function() {
+      var helpers, _ref;
       helpers = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-      (_base = this.prototype).__helpers || (_base.__helpers = []);
-      helpers.map(function(helper) {
-        var module;
-        module = Joosy.Helpers[helper];
-        if (!module) {
-          throw new Error("Cannot find helper module " + helper);
-        }
-        return _this.prototype.__helpers.push(module);
-      });
+      if (!this.prototype.hasOwnProperty("__helpers")) {
+        this.prototype.__helpers = ((_ref = this.__super__.__helpers) != null ? _ref.clone() : void 0) || [];
+      }
+      this.prototype.__helpers = this.prototype.__helpers.add(helpers).unique();
       return this.prototype.__helpers = this.prototype.__helpers.unique();
     };
   },
-  __instantiateHelpers: function() {
-    var helper, _i, _len, _ref,
-      _this = this;
-    if (!this.__helpersInstance) {
-      this.__helpersInstance = Object.extended(Joosy.Helpers.Application);
-      if (this.onRefresh) {
-        this.__helpersInstance.onRefresh = function(callback) {
-          return _this.onRefresh(callback);
-        };
-      }
-      if (this.__helpers) {
-        _ref = this.__helpers;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          helper = _ref[_i];
-          Joosy.Module.merge(this.__helpersInstance, helper);
-        }
-      }
-    }
-    return this.__helpersInstance;
-  },
-  __proxifyHelpers: function(locals) {
-    if (locals.hasOwnProperty('__proto__')) {
-      locals.__proto__ = this.__instantiateHelpers();
-      return locals;
-    } else {
-      if (!this.__helpersProxyInstance) {
-        this.__helpersProxyInstance = function(locals) {
-          return Joosy.Module.merge(this, locals);
-        };
-        this.__helpersProxyInstance.prototype = this.__instantiateHelpers();
-      }
-      return new this.__helpersProxyInstance(locals);
-    }
-  },
   render: function(template, locals, parentStackPointer) {
     if (locals == null) {
       locals = {};
@@ -1154,8 +1056,67 @@ Joosy.Modules.Renderer = {
     }
     return this.__render(true, template, locals, parentStackPointer);
   },
+  __assignHelpers: function() {
+    var _this = this;
+    if (this.__helpers == null) {
+      return;
+    }
+    if (!this.hasOwnProperty("__helpers")) {
+      this.__helpers = this.__helpers.clone();
+    }
+    return this.__helpers.each(function(helper, i) {
+      if (!Object.isObject(helper)) {
+        if (_this[helper] == null) {
+          throw new Error("Cannot find method '" + helper + "' to use as helper");
+        }
+        _this.__helpers[i] = {};
+        return _this.__helpers[i][helper] = function() {
+          return _this[helper].apply(_this, arguments);
+        };
+      }
+    });
+  },
+  __instantiateHelpers: function() {
+    var helper, _i, _len, _ref;
+    if (!this.__helpersInstance) {
+      this.__assignHelpers();
+      this.__helpersInstance = Object.extended(Joosy.Helpers.Application);
+      this.__helpersInstance.__renderer = this;
+      if (this.__helpers) {
+        _ref = this.__helpers;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          helper = _ref[_i];
+          Joosy.Module.merge(this.__helpersInstance, helper);
+        }
+      }
+    }
+    return this.__helpersInstance;
+  },
+  __instantiateRenderers: function(parentStackPointer) {
+    var _this = this;
+    return {
+      render: function(template, locals) {
+        if (locals == null) {
+          locals = {};
+        }
+        return _this.render(template, locals, parentStackPointer);
+      },
+      renderDynamic: function(template, locals) {
+        if (locals == null) {
+          locals = {};
+        }
+        return _this.renderDynamic(template, locals, parentStackPointer);
+      },
+      renderInline: function(locals, template) {
+        if (locals == null) {
+          locals = {};
+        }
+        return _this.renderDynamic(template, locals, parentStackPointer);
+      }
+    };
+  },
   __render: function(dynamic, template, locals, parentStackPointer) {
-    var assignContext, binding, context, key, morph, object, renderers, result, stack, update,
+    var binding, context, key, morph, object, result, stack, update,
       _this = this;
     if (locals == null) {
       locals = {};
@@ -1166,65 +1127,38 @@ Joosy.Modules.Renderer = {
     stack = this.__renderingStackChildFor(parentStackPointer);
     stack.template = template;
     stack.locals = locals;
-    assignContext = false;
     if (Object.isString(template)) {
       if (this.__renderSection != null) {
         template = Joosy.Application.templater.resolveTemplate(this.__renderSection(), template, this);
       }
       template = Joosy.Application.templater.buildView(template);
-    } else if (Object.isFunction(template)) {
-      assignContext = true;
     } else if (!Object.isFunction(template)) {
       throw new Error("" + (Joosy.Module.__className(this)) + "> template (maybe @view) does not look like a string or lambda");
     }
     if (!Object.isObject(locals) && Object.extended().constructor !== locals.constructor) {
       throw new Error("" + (Joosy.Module.__className(this)) + "> locals (maybe @data?) is not a hash");
     }
-    renderers = {
-      render: function(template, locals) {
-        if (locals == null) {
-          locals = {};
-        }
-        return _this.render(template, locals, stack);
-      },
-      renderDynamic: function(template, locals) {
-        if (locals == null) {
-          locals = {};
-        }
-        return _this.renderDynamic(template, locals, stack);
-      },
-      renderInline: function(locals, template) {
-        if (locals == null) {
-          locals = {};
-        }
-        return _this.renderDynamic(template, locals, stack);
-      }
-    };
     context = function() {
       var data;
       data = {};
       Joosy.Module.merge(data, stack.locals);
       Joosy.Module.merge(data, _this.__instantiateHelpers(), false);
-      Joosy.Module.merge(data, renderers);
+      Joosy.Module.merge(data, _this.__instantiateRenderers(stack));
       return data;
     };
     result = function() {
-      if (assignContext) {
-        return template.call(context());
-      } else {
-        return template(context());
-      }
+      return template(context());
     };
     if (dynamic) {
       morph = Metamorph(result());
       update = function() {
-        var callback, child, object, _i, _j, _len, _len1, _ref, _ref1, _ref2, _results;
+        var binding, child, object, _i, _j, _len, _len1, _ref, _ref1, _ref2, _results;
         if (morph.isRemoved()) {
           _ref = morph.__bindings;
           _results = [];
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-            _ref1 = _ref[_i], object = _ref1[0], callback = _ref1[1];
-            _results.push(object.unbind(callback));
+            _ref1 = _ref[_i], object = _ref1[0], binding = _ref1[1];
+            _results.push(object.unbind(binding));
           }
           return _results;
         } else {
@@ -1234,23 +1168,20 @@ Joosy.Modules.Renderer = {
             _this.__removeMetamorphs(child);
           }
           stack.children = [];
-          morph.html(result());
-          return typeof _this.refreshElements === "function" ? _this.refreshElements() : void 0;
+          return morph.html(result());
         }
       };
       update = update.debounce(0);
-      morph.__bindings = [];
       for (key in locals) {
         object = locals[key];
         if (locals.hasOwnProperty(key)) {
           if (((object != null ? object.bind : void 0) != null) && ((object != null ? object.unbind : void 0) != null)) {
-            binding = [object, update];
-            object.bind('changed', update);
+            binding = [object, object.bind('changed', update)];
             stack.metamorphBindings.push(binding);
-            morph.__bindings.push(binding);
           }
         }
       }
+      morph.__bindings = stack.metamorphBindings;
       return morph.outerHTML();
     } else {
       return result();
@@ -1390,14 +1321,13 @@ Joosy.Modules.WidgetsManager = {
     return this.__activeWidgets.splice(this.__activeWidgets.indexOf(widget), 1);
   },
   __setupWidgets: function() {
-    var registered, widgets,
+    var registered,
       _this = this;
-    widgets = this.__widgets;
-    registered = Object.extended();
-    if (!widgets) {
+    if (!this.__widgets) {
       return;
     }
-    Object.each(widgets, function(selector, widget) {
+    registered = Object.extended();
+    Object.each(this.__widgets, function(selector, widget) {
       var activeSelector;
       if (selector === '$container') {
         activeSelector = _this.container;
@@ -1415,16 +1345,21 @@ Joosy.Modules.WidgetsManager = {
         } else {
           instance = widget.call(_this, index);
         }
-        (_base = registered[selector])[_name = Joosy.Module.__className(instance)] || (_base[_name] = 0);
-        registered[selector][Joosy.Module.__className(instance)] += 1;
+        if (Joosy.Application.config.debug) {
+          (_base = registered[selector])[_name = Joosy.Module.__className(instance)] || (_base[_name] = 0);
+          registered[selector][Joosy.Module.__className(instance)] += 1;
+        }
         return _this.registerWidget($(elem), instance);
       });
     });
-    return registered.each(function(selector, value) {
-      return value.each(function(widget, count) {
-        return Joosy.Modules.Log.debugAs(_this, "Widget " + widget + " registered at '" + selector + "'. Elements: " + count);
+    this.__widgets = {};
+    if (Joosy.Application.config.debug) {
+      return registered.each(function(selector, value) {
+        return value.each(function(widget, count) {
+          return Joosy.Modules.Log.debugAs(_this, "Widget " + widget + " registered at '" + selector + "'. Elements: " + count);
+        });
       });
-    });
+    }
   },
   __unloadWidgets: function() {
     var widget, _i, _len, _ref, _results;
@@ -1461,7 +1396,9 @@ Joosy.Modules.Filters = {
 };
 
 ['beforeLoad', 'afterLoad', 'afterUnload'].each(function(filter) {
-  return Joosy.Modules.Filters["__run" + (filter.camelize(true)) + "s"] = function() {
+  var camelized;
+  camelized = filter.charAt(0).toUpperCase() + filter.slice(1);
+  return Joosy.Modules.Filters["__run" + camelized + "s"] = function() {
     var opts,
       _this = this;
     opts = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
@@ -1503,6 +1440,8 @@ Joosy.Layout = (function(_super) {
 
   Layout.view('default');
 
+  Layout.helper('page');
+
   Layout.beforePaint = function(callback) {
     return this.prototype.__beforePaint = callback;
   };
@@ -1532,6 +1471,7 @@ Joosy.Layout = (function(_super) {
 
   function Layout(params) {
     this.params = params;
+    this.uid = Joosy.uid();
   }
 
   Layout.prototype.navigate = function() {
@@ -1559,12 +1499,16 @@ Joosy.Layout = (function(_super) {
     return this.__runAfterUnloads();
   };
 
-  Layout.prototype["yield"] = function() {
-    return this.uuid = Joosy.uuid();
+  Layout.prototype.page = function(tag, options) {
+    if (options == null) {
+      options = {};
+    }
+    options.id = this.uid;
+    return Joosy.Helpers.Application.tag(tag, options);
   };
 
   Layout.prototype.content = function() {
-    return $("#" + this.uuid);
+    return $("#" + this.uid);
   };
 
   return Layout;
@@ -1697,7 +1641,7 @@ Joosy.Page = (function(_super) {
     this.__layoutClass || (this.__layoutClass = ApplicationLayout);
     if (!(this.halted = !this.__runBeforeLoads(this.params, this.previous))) {
       Joosy.Application.loading = true;
-      if ((((_ref = this.previous) != null ? (_ref1 = _ref.layout) != null ? _ref1.uuid : void 0 : void 0) == null) || ((_ref2 = this.previous) != null ? _ref2.__layoutClass : void 0) !== this.__layoutClass) {
+      if ((((_ref = this.previous) != null ? (_ref1 = _ref.layout) != null ? _ref1.uid : void 0 : void 0) == null) || ((_ref2 = this.previous) != null ? _ref2.__layoutClass : void 0) !== this.__layoutClass) {
         this.__bootstrapLayout();
       } else {
         this.__bootstrap();
@@ -1770,10 +1714,9 @@ Joosy.Page = (function(_super) {
         }
       }
       return _this.__callSyncedThrough(_this, '__paint', callbacksParams, function() {
-        _this.swapContainer(_this.layout.content(), _this.__renderer(_this.data || {}));
+        _this.swapContainer(_this.layout.content(), _this.__renderDefault(_this.data || {}));
         _this.container = _this.layout.content();
-        _this.__load();
-        return _this.layout.content();
+        return _this.__load();
       });
     });
     this.__callSyncedThrough(this.previous, '__erase', callbacksParams, function() {
@@ -1802,19 +1745,11 @@ Joosy.Page = (function(_super) {
     }
     this.wait("stageClear dataReceived", function() {
       return _this.__callSyncedThrough(_this.layout, '__paint', callbacksParams, function() {
-        var data;
-        data = Joosy.Module.merge({}, _this.layout.data || {});
-        data = Joosy.Module.merge(data, {
-          "yield": function() {
-            return _this.layout["yield"]();
-          }
-        });
-        _this.swapContainer(Joosy.Application.content(), _this.layout.__renderer(data));
-        _this.swapContainer(_this.layout.content(), _this.__renderer(_this.data || {}));
+        _this.swapContainer(Joosy.Application.content(), _this.layout.__renderDefault(_this.layout.data || {}));
+        _this.swapContainer(_this.layout.content(), _this.__renderDefault(_this.data || {}));
         _this.container = _this.layout.content();
         _this.layout.__load(Joosy.Application.content());
-        _this.__load();
-        return Joosy.Application.content();
+        return _this.__load();
       });
     });
     this.__callSyncedThrough((_ref = this.previous) != null ? _ref.layout : void 0, '__erase', callbacksParams, function() {
@@ -2215,7 +2150,7 @@ Joosy.Widget = (function(_super) {
 
   Widget.include(Joosy.Modules.WidgetsManager);
 
-  Widget.prototype.__renderer = false;
+  Widget.prototype.__renderDefault = false;
 
   Widget.prototype.data = false;
 
@@ -2236,8 +2171,8 @@ Joosy.Widget = (function(_super) {
       render = true;
     }
     this.__runBeforeLoads();
-    if (render && this.__renderer) {
-      this.swapContainer(this.container, this.__renderer(this.data || {}));
+    if (render && this.__renderDefault) {
+      this.swapContainer(this.container, this.__renderDefault(this.data || {}));
     }
     this.__assignElements();
     this.__delegateEvents();