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

Add a flag we can use to skip string template calcs in release

Browse Source
This commit is contained in:
Panayot Cankov
2016-05-17 15:36:33 +03:00
parent 114f8b47ae
commit eda260323e
42 changed files with 705 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/tab-view/tab-view-common.ts
View File

@ -122,7 +122,9 @@ export class TabView extends view.View implements definition.TabView, view.AddAr
}
public _onItemsPropertyChangedSetNativeValue(data: dependencyObservable.PropertyChangeData) {
trace.write("TabView.__onItemsPropertyChangedSetNativeValue(" + data.oldValue + " -> " + data.newValue + ");", traceCategory);
if (trace.enabled) {
trace.write("TabView.__onItemsPropertyChangedSetNativeValue(" + data.oldValue + " -> " + data.newValue + ");", traceCategory);
}
if (data.oldValue) {
this._removeTabs(data.oldValue);
}
@ -135,7 +137,9 @@ export class TabView extends view.View implements definition.TabView, view.AddAr
}
public _updateSelectedIndexOnItemsPropertyChanged(newItems) {
trace.write("TabView._updateSelectedIndexOnItemsPropertyChanged(" + newItems + ");", traceCategory);
if (trace.enabled) {
trace.write("TabView._updateSelectedIndexOnItemsPropertyChanged(" + newItems + ");", traceCategory);
}
var newItemsCount = 0;
if (newItems) {
newItemsCount = newItems.length;

36
ui/tab-view/tab-view.android.ts
View File

@ -67,7 +67,9 @@ function ensurePagerAdapterClass() {
}
instantiateItem(container: android.view.ViewGroup, index: number) {
trace.write("TabView.PagerAdapter.instantiateItem; container: " + container + "; index: " + index, common.traceCategory);
if (trace.enabled) {
trace.write("TabView.PagerAdapter.instantiateItem; container: " + container + "; index: " + index, common.traceCategory);
}
var item = this.items[index];
if (item.view.parent !== this.owner) {
@ -75,7 +77,9 @@ function ensurePagerAdapterClass() {
}
if (this[VIEWS_STATES]) {
trace.write("TabView.PagerAdapter.instantiateItem; restoreHierarchyState: " + item.view, common.traceCategory);
if (trace.enabled) {
trace.write("TabView.PagerAdapter.instantiateItem; restoreHierarchyState: " + item.view, common.traceCategory);
}
item.view._nativeView.restoreHierarchyState(this[VIEWS_STATES]);
}
@ -84,7 +88,9 @@ function ensurePagerAdapterClass() {
}
destroyItem(container: android.view.ViewGroup, index: number, _object: any) {
trace.write("TabView.PagerAdapter.destroyItem; container: " + container + "; index: " + index + "; _object: " + _object, common.traceCategory);
if (trace.enabled) {
trace.write("TabView.PagerAdapter.destroyItem; container: " + container + "; index: " + index + "; _object: " + _object, common.traceCategory);
}
var item = this.items[index];
var nativeView = item.view._nativeView;
@ -111,7 +117,9 @@ function ensurePagerAdapterClass() {
}
saveState(): android.os.Parcelable {
trace.write("TabView.PagerAdapter.saveState", common.traceCategory);
if (trace.enabled) {
trace.write("TabView.PagerAdapter.saveState", common.traceCategory);
}
var owner: TabView = this.owner;
if (!owner || owner._childrenCount === 0) {
@ -137,7 +145,9 @@ function ensurePagerAdapterClass() {
}
restoreState(state: android.os.Parcelable, loader: java.lang.ClassLoader) {
trace.write("TabView.PagerAdapter.restoreState", common.traceCategory);
if (trace.enabled) {
trace.write("TabView.PagerAdapter.restoreState", common.traceCategory);
}
var bundle: android.os.Bundle = <android.os.Bundle>state;
bundle.setClassLoader(loader);
this[VIEWS_STATES] = bundle.getSparseParcelableArray(VIEWS_STATES);
@ -199,7 +209,9 @@ export class TabView extends common.TabView {
}
public _createUI() {
trace.write("TabView._createUI(" + this + ");", common.traceCategory);
if (trace.enabled) {
trace.write("TabView._createUI(" + this + ");", common.traceCategory);
}
this._grid = new org.nativescript.widgets.GridLayout(this._context);
this._grid.addRow(new org.nativescript.widgets.ItemSpec(1, org.nativescript.widgets.GridUnitType.auto));
@ -246,7 +258,9 @@ export class TabView extends common.TabView {
}
public _onItemsPropertyChangedSetNativeValue(data: dependencyObservable.PropertyChangeData) {
trace.write("TabView._onItemsPropertyChangedSetNativeValue(" + data.oldValue + " ---> " + data.newValue + ");", common.traceCategory);
if (trace.enabled) {
trace.write("TabView._onItemsPropertyChangedSetNativeValue(" + data.oldValue + " ---> " + data.newValue + ");", common.traceCategory);
}
if (data.oldValue) {
var oldItems: Array<TabViewItem> = data.oldValue;
@ -295,7 +309,9 @@ export class TabView extends common.TabView {
}
public _onSelectedIndexPropertyChangedSetNativeValue(data: dependencyObservable.PropertyChangeData) {
trace.write("TabView._onSelectedIndexPropertyChangedSetNativeValue(" + data.oldValue + " ---> " + data.newValue + ");", common.traceCategory);
if (trace.enabled) {
trace.write("TabView._onSelectedIndexPropertyChangedSetNativeValue(" + data.oldValue + " ---> " + data.newValue + ");", common.traceCategory);
}
super._onSelectedIndexPropertyChangedSetNativeValue(data);
var index = data.newValue;
@ -303,7 +319,9 @@ export class TabView extends common.TabView {
// Select the respective page in the ViewPager
var viewPagerSelectedIndex = this._viewPager.getCurrentItem();
if (viewPagerSelectedIndex !== index) {
trace.write("TabView this._viewPager.setCurrentItem(" + index + ", true);", common.traceCategory);
if (trace.enabled) {
trace.write("TabView this._viewPager.setCurrentItem(" + index + ", true);", common.traceCategory);
}
this._viewPager.setCurrentItem(index, true);
}
}

32
ui/tab-view/tab-view.ios.ts
View File

@ -30,7 +30,9 @@ class UITabBarControllerImpl extends UITabBarController {
}
public viewDidLayoutSubviews(): void {
trace.write("TabView.UITabBarControllerClass.viewDidLayoutSubviews();", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView.UITabBarControllerClass.viewDidLayoutSubviews();", trace.categories.Debug);
}
super.viewDidLayoutSubviews();
let owner = this._owner.get();
if (owner && owner.isLoaded) {
@ -51,7 +53,9 @@ class UITabBarControllerDelegateImpl extends NSObject implements UITabBarControl
}
public tabBarControllerDidSelectViewController(tabBarController: UITabBarController, viewController: UIViewController): void {
trace.write("TabView.UITabBarControllerDelegateClass.tabBarControllerDidSelectViewController(" + tabBarController + ", " + viewController + ");", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView.UITabBarControllerDelegateClass.tabBarControllerDidSelectViewController(" + tabBarController + ", " + viewController + ");", trace.categories.Debug);
}
let owner = this._owner.get();
if (owner) {
owner._onViewControllerShown(viewController);
@ -71,7 +75,9 @@ class UINavigationControllerDelegateImpl extends NSObject implements UINavigatio
}
navigationControllerDidShowViewControllerAnimated(navigationController: UINavigationController, viewController: UIViewController, animated: boolean): void {
trace.write("TabView.UINavigationControllerDelegateClass.navigationControllerDidShowViewControllerAnimated(" + navigationController + ", " + viewController + ", " + animated + ");", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView.UINavigationControllerDelegateClass.navigationControllerDidShowViewControllerAnimated(" + navigationController + ", " + viewController + ", " + animated + ");", trace.categories.Debug);
}
// We don't need Edit button in More screen.
navigationController.navigationBar.topItem.rightBarButtonItem = null;
let owner = this._owner.get();
@ -158,17 +164,23 @@ export class TabView extends common.TabView {
public _onViewControllerShown(viewController: UIViewController) {
// This method could be called with the moreNavigationController or its list controller, so we have to check.
trace.write("TabView._onViewControllerShown(" + viewController + ");", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView._onViewControllerShown(" + viewController + ");", trace.categories.Debug);
}
if (this._ios.viewControllers.containsObject(viewController)) {
this.selectedIndex = this._ios.viewControllers.indexOfObject(viewController);;
}
else {
trace.write("TabView._onViewControllerShown: viewController is not one of our viewControllers", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView._onViewControllerShown: viewController is not one of our viewControllers", trace.categories.Debug);
}
}
}
public _removeTabs(oldItems: Array<definition.TabViewItem>) {
trace.write("TabView._removeTabs(" + oldItems + ");", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView._removeTabs(" + oldItems + ");", trace.categories.Debug);
}
super._removeTabs(oldItems);
var i: number;
@ -184,7 +196,9 @@ export class TabView extends common.TabView {
}
public _addTabs(newItems: Array<definition.TabViewItem>) {
trace.write("TabView._addTabs(" + newItems + ");", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView._addTabs(" + newItems + ");", trace.categories.Debug);
}
super._addTabs(newItems);
var i: number;
@ -262,7 +276,9 @@ export class TabView extends common.TabView {
super._onSelectedIndexPropertyChangedSetNativeValue(data);
var newIndex = data.newValue;
trace.write("TabView._onSelectedIndexPropertyChangedSetNativeValue(" + newIndex + ")", trace.categories.Debug);
if (trace.enabled) {
trace.write("TabView._onSelectedIndexPropertyChangedSetNativeValue(" + newIndex + ")", trace.categories.Debug);
}
if (types.isNullOrUndefined(newIndex)) {
return;
}