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

Break a circular import view-application-view.

Browse Source 
By late-importing application in bindable and stylers-common.
This commit is contained in:
Hristo Deshev
2015-10-16 13:53:35 +03:00
parent dd4c4aaefb
commit 76fa713c85
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ui/core/bindable.ts
View File

@ -2,13 +2,22 @@
import definition = require("ui/core/bindable");
import dependencyObservable = require("ui/core/dependency-observable");
import weakEvents = require("ui/core/weak-event-listener");
import appModule = require("application");
import types = require("utils/types");
import trace = require("trace");
import polymerExpressions = require("js-libs/polymer-expressions");
import bindingBuilder = require("../builder/binding-builder");
import viewModule = require("ui/core/view");
//late import
var _appModule = null;
function appModule() {
if (!_appModule) {
_appModule = require("application");
}
return _appModule;
}
var bindingContextProperty = new dependencyObservable.Property(
"bindingContext",
"Bindable",
@ -359,9 +368,9 @@ export class Binding {
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];
for (var prop in appModule().resources) {
if (appModule().resources.hasOwnProperty(prop) && !context.hasOwnProperty(prop)) {
context[prop] = appModule().resources[prop];
}
}

16
ui/styling/stylers-common.ts
View File

@ -1,8 +1,17 @@
import view = require("ui/core/view");
import application = require("application");
import dependencyObservable = require("ui/core/dependency-observable");
import types = require("utils/types");
//late import
var _appModule = null;
function appModule() {
if (!_appModule) {
_appModule = require("application");
}
return _appModule;
}
var _defaultNativeValuesCache = {};
export class StylePropertyChangedHandler {
@ -26,10 +35,9 @@ export class StylePropertyChangedHandler {
_defaultNativeValuesCache[className + property.id] = this._getNativeValue(view);
}
if (application.android) {
if (appModule().android) {
newValue = newValue.android ? newValue.android : newValue;
}
else if (application.ios) {
} else if (appModule().ios) {
newValue = newValue.ios ? newValue.ios : newValue;
}