cavalion-blocks
Advanced tools
Comparing version 0.9.14 to 0.9.15
@@ -0,1 +1,10 @@ | ||
### 2020-04-14 - 0.9.15 | ||
- Introducing B.i (aka blocks.i and/or Blocks.i) => short for instantiate | ||
- prototypes/Tab: Introducing vars.parent | ||
- should the a (config)parameter? | ||
- properties, vars, (props), (params), parameters | ||
### 2020-04-07 - 0.9.14 | ||
- Some cosmetic changes | ||
### 2019-12-02 - 0.9.13 | ||
@@ -2,0 +11,0 @@ - Fixing some bugs related to requiring relatively addressed resources |
{ | ||
"name": "cavalion-blocks", | ||
"version": "0.9.14", | ||
"version": "0.9.15", | ||
"description": "`blocks-dot-js` `[].js`", | ||
@@ -5,0 +5,0 @@ "main": "README.js", |
@@ -382,3 +382,5 @@ define(function(require) { | ||
Blocks.i = Blocks.instantiate; | ||
return Blocks; | ||
}); |
@@ -108,3 +108,2 @@ define(function(require) { | ||
var args = js.copy_args(arguments); | ||
sourceUri = sourceUri || uri; | ||
@@ -611,4 +610,7 @@ | ||
uri = "text!" + this.resolveUri(uri); | ||
suffix = arguments.length === 2 ? suffix : ".js"; | ||
return !uri.endsWith(suffix) ? uri + suffix : uri; | ||
if(!uri.endsWith(".blocks")) { | ||
suffix = arguments.length === 2 ? suffix : ".js"; | ||
return !uri.endsWith(suffix) ? uri + suffix : uri; | ||
} | ||
return uri; | ||
}, | ||
@@ -615,0 +617,0 @@ unreq: function(name) { |
@@ -33,3 +33,3 @@ define(["js/Deferred", "blocks/Blocks"], function(Deferred, Blocks) { | ||
if(!(r instanceof Array)) { | ||
r = eval(r); | ||
r = eval(r); // require parameter is in 'scope' | ||
} | ||
@@ -36,0 +36,0 @@ if(r instanceof Array) { |
@@ -14,8 +14,9 @@ "use locale, js, blocks/Blocks"; | ||
if(this._control === null && cls) { | ||
this._control = B.instantiate([String.format("%s<%s>", cls, this._name)], { | ||
uri: String.format("%s<%s>", cls.split(":").pop(), this._name), | ||
var uri = this.vars("uri"); | ||
this._control = B.instantiate([uri || String.format("%s<%s>", cls, this._name)], { | ||
uri: uri || String.format("%s<%s>", cls.split(":").pop(), this._name), | ||
owner: this, setIsRoot: true, | ||
loaded: function(control) { | ||
var parent = me._parent._parent; | ||
// me._parent.vars(["vcl/ui/Tab:parent", true]) | ||
var parent = me._parent.vars("parent") || me._parent._parent; | ||
me.setControl(control); | ||
@@ -22,0 +23,0 @@ control.setVisible(me.isSelected()); |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
67456
1687
40