javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-26 03:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1430 from NativeScript/gatanasov/lazy-require-fixes

Browse Source 
Revisit lazy require routine
This commit is contained in:
Hristo Hristov
2016-02-01 16:54:31 +02:00
parent d4766ed83c f4c880dbda
commit 1e0f130b38
63 changed files with 582 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ui/core/bindable.ts
View File

@ -11,13 +11,25 @@ import * as polymerExpressionsModule from "js-libs/polymer-expressions";
import * as specialPropertiesModule from "ui/builder/special-properties";
//late import
var _appModule: typeof applicationModule = null;
function appModule() {
if (!_appModule) {
_appModule = require("application");
var application: typeof applicationModule;
function ensureApplication() {
if (!application) {
application = require("application");
}
}
var expressions: typeof polymerExpressionsModule;
function ensureExpressions() {
if (!expressions) {
expressions = require("js-libs/polymer-expressions");
}
}
var specialProperties: typeof specialPropertiesModule;
function ensureSpecialProperties() {
if (!specialProperties) {
specialProperties = require("ui/builder/special-properties");
}
return _appModule;
}
var bindingContextProperty = new dependencyObservable.Property(
@ -364,15 +376,16 @@ export class Binding {
private _getExpressionValue(expression: string, isBackConvert: boolean, changedModel: any): any {
try {
var polymerExpressions: typeof polymerExpressionsModule = require("js-libs/polymer-expressions");
ensureExpressions();
var exp = polymerExpressions.PolymerExpressions.getExpression(expression);
var exp = expressions.PolymerExpressions.getExpression(expression);
if (exp) {
var context = this.source && this.source.get && this.source.get() || global;
var model = {};
for (var prop in appModule().resources) {
if (appModule().resources.hasOwnProperty(prop) && !context.hasOwnProperty(prop)) {
context[prop] = appModule().resources[prop];
ensureApplication();
for (var prop in application.resources) {
if (application.resources.hasOwnProperty(prop) && !context.hasOwnProperty(prop)) {
context[prop] = application.resources[prop];
}
}
@ -593,9 +606,9 @@ export class Binding {
optionsInstance.off(options.property, null, optionsInstance.bindingContext);
optionsInstance.on(options.property, value, optionsInstance.bindingContext);
} else {
var sp: typeof specialPropertiesModule = require("ui/builder/special-properties");
ensureSpecialProperties();
let specialSetter = sp.getSpecialPropertySetter(options.property);
let specialSetter = specialProperties.getSpecialPropertySetter(options.property);
if (specialSetter) {
specialSetter(optionsInstance, value);
} else {