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

removed unused overrides

Browse Source
This commit is contained in:
hshristov
2015-11-06 10:05:26 +02:00
parent c06b0681fa
commit a23d8ad4f0
2 changed files with 2 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CrossPlatformModules.csproj
View File

@ -663,6 +663,7 @@
<TypeScriptCompile Include="ui\builder\binding-builder.d.ts" /> <TypeScriptCompile Include="ui\builder\binding-builder.d.ts" />
<TypeScriptCompile Include="ui\builder\special-properties.d.ts" /> <TypeScriptCompile Include="ui\builder\special-properties.d.ts" />
<TypeScriptCompile Include="ui\builder\special-properties.ts" /> <TypeScriptCompile Include="ui\builder\special-properties.ts" />
<TypeScriptCompile Include="ui\styling\background.android.d.ts" />
<TypeScriptCompile Include="ui\styling\style-scope.d.ts" /> <TypeScriptCompile Include="ui\styling\style-scope.d.ts" />
<TypeScriptCompile Include="ui\styling\style.d.ts" /> <TypeScriptCompile Include="ui\styling\style.d.ts" />
<TypeScriptCompile Include="ui\ui.d.ts" /> <TypeScriptCompile Include="ui\ui.d.ts" />
@ -2093,7 +2094,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>
<UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" /> <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

65
ui/frame/frame.android.ts
View File

@ -22,20 +22,12 @@ var navDepth = -1;
var PageFragmentBody = (<any>android.app.Fragment).extend({ var PageFragmentBody = (<any>android.app.Fragment).extend({
onAttach: function (activity: android.app.Activity) {
console.log("PageFragmentBody onAttach called");
this.super.onAttach(activity);
console.log("PageFragmentBody onAttach ended");
},
onCreate: function (savedInstanceState: android.os.Bundle) { onCreate: function (savedInstanceState: android.os.Bundle) {
console.log("PageFragmentBody onCreate called");
this.super.onCreate(savedInstanceState); this.super.onCreate(savedInstanceState);
this.super.setHasOptionsMenu(true); this.super.setHasOptionsMenu(true);
}, },
onCreateView: function (inflater: android.view.LayoutInflater, container: android.view.ViewGroup, savedInstanceState: android.os.Bundle): android.view.View { onCreateView: function (inflater: android.view.LayoutInflater, container: android.view.ViewGroup, savedInstanceState: android.os.Bundle): android.view.View {
console.log("PageFragmentBody onCreateView called");
var entry = this.entry; var entry = this.entry;
var page = entry.resolvedPage; var page = entry.resolvedPage;
if (savedInstanceState && savedInstanceState.getBoolean(HIDDEN, false)) { if (savedInstanceState && savedInstanceState.getBoolean(HIDDEN, false)) {
@ -45,12 +37,10 @@ var PageFragmentBody = (<any>android.app.Fragment).extend({
else { else {
onFragmentShown(this); onFragmentShown(this);
} }
console.log("PageFragmentBody onCreateView ended");
return page._nativeView; return page._nativeView;
}, },
onHiddenChanged: function (hidden: boolean) { onHiddenChanged: function (hidden: boolean) {
console.log("PageFragmentBody onHiddenChanged called");
this.super.onHiddenChanged(hidden); this.super.onHiddenChanged(hidden);
if (hidden) { if (hidden) {
onFragmentHidden(this); onFragmentHidden(this);
@ -58,73 +48,23 @@ var PageFragmentBody = (<any>android.app.Fragment).extend({
else { else {
onFragmentShown(this); onFragmentShown(this);
} }
console.log("PageFragmentBody onHiddenChanged ended");
},
onActivityCreated: function (savedInstanceState: android.os.Bundle) {
console.log("PageFragmentBody onActivityCreated called");
this.super.onActivityCreated(savedInstanceState);
console.log("PageFragmentBody onActivityCreated ended");
}, },
onSaveInstanceState: function (outState: android.os.Bundle) { onSaveInstanceState: function (outState: android.os.Bundle) {
console.log("PageFragmentBody onSaveInstanceState called");
this.super.onSaveInstanceState(outState); this.super.onSaveInstanceState(outState);
if (this.isHidden()) { if (this.isHidden()) {
outState.putBoolean(HIDDEN, true); outState.putBoolean(HIDDEN, true);
} }
console.log("PageFragmentBody onSaveInstanceState ended");
},
onViewStateRestored: function (savedInstanceState: android.os.Bundle) {
console.log("PageFragmentBody onViewStateRestored called");
this.super.onViewStateRestored(savedInstanceState);
trace.write(this.getTag() + ".onViewStateRestored(); savedInstanceState: " + savedInstanceState, trace.categories.NativeLifecycle);
console.log("PageFragmentBody onViewStateRestored ended");
},
onStart: function () {
console.log("PageFragmentBody onStart called");
this.super.onStart();
console.log("PageFragmentBody onStart ended");
},
onResume: function () {
console.log("PageFragmentBody onResume called");
this.super.onResume();
console.log("PageFragmentBody onResume ended");
},
onPause: function () {
console.log("PageFragmentBody onPause called");
this.super.onPause();
console.log("PageFragmentBody onPause ended");
},
onStop: function () {
console.log("PageFragmentBody onStop called");
this.super.onStop();
console.log("PageFragmentBody onStop ended");
}, },
onDestroyView: function () { onDestroyView: function () {
console.log("PageFragmentBody onDestroyView called");
this.super.onDestroyView(); this.super.onDestroyView();
onFragmentHidden(this); onFragmentHidden(this);
console.log("PageFragmentBody onDestroyView ended");
}, },
onDestroy: function () { onDestroy: function () {
console.log("PageFragmentBody onDestroy called");
this.super.onDestroy(); this.super.onDestroy();
utils.GC(); utils.GC();
console.log("PageFragmentBody onDestroy ended");
},
onDetach: function () {
console.log("PageFragmentBody onDetach called");
this.super.onDetach();
console.log("PageFragmentBody onDetach ended");
} }
}); });
@ -391,13 +331,8 @@ export class Frame extends frameCommon.Frame {
var fragmentTransaction = manager.beginTransaction(); var fragmentTransaction = manager.beginTransaction();
var newFragmentTag = "fragment" + navDepth; var newFragmentTag = "fragment" + navDepth;
//var newFragment = new PageFragmentBody(this, backstackEntry);
var newFragment = new PageFragmentBody(); var newFragment = new PageFragmentBody();
var args = new android.os.Bundle();
args.putInt("num", num);
newFragment.setArguments(args);
newFragment.frame = this; newFragment.frame = this;
newFragment.entry = backstackEntry; newFragment.entry = backstackEntry;