Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-26515](7_5_X) : Revert "Merge pull request #10068 from hansemannn/TIMOB-26060" #10421

Merged
merged 1 commit into from
Nov 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions apidoc/Titanium/Network/Cookie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ description: |
}
]
};
var navigationController = Ti.UI.createNavigationWindow();
var navigationController = Ti.UI.iOS.createNavigationWindow();

function LoadCookiesWindow() {
var close = Ti.UI.createButton({
Expand All @@ -94,7 +94,7 @@ description: |
// rightNavButton: close
backgroundColor: '#ccc'
});
var nav = Ti.UI.createNavigationWindow({
var nav = Ti.UI.iOS.createNavigationWindow({
window: win
});
var webview = Ti.UI.createWebView({
Expand Down Expand Up @@ -434,7 +434,7 @@ description: |

navigationController.window = MainWindow();
navigationController.open();

extends: Titanium.Proxy
since: {android: "3.2.0", iphone: "3.3.0", ipad: "3.3.0"}
platforms: [android, iphone, ipad]
Expand Down
145 changes: 0 additions & 145 deletions apidoc/Titanium/UI/NavigationWindow.yml

This file was deleted.

4 changes: 2 additions & 2 deletions apidoc/Titanium/UI/View.yml
Original file line number Diff line number Diff line change
Expand Up @@ -764,11 +764,11 @@ methods:

There are certain top-level containers that are not intended to be added
as the children of other views. These top-level containers include
<Titanium.UI.Window>, <Titanium.UI.iPad.SplitWindow>, <Titanium.UI.NavigationWindow>,
<Titanium.UI.Window>, <Titanium.UI.iPad.SplitWindow>, <Titanium.UI.iOS.NavigationWindow>,
and <Titanium.UI.TabGroup>. Other types of views must be added
to a top-level container in order to be displayed on screen.

The special containers <Titanium.UI.NavigationWindow>,
The special containers <Titanium.UI.iOS.NavigationWindow>,
<Titanium.UI.iPad.SplitWindow>, <Titanium.UI.Tab>, and
<Titanium.UI.TabGroup> manage windows.
These managed windows may be referred to as *children* of the
Expand Down
30 changes: 15 additions & 15 deletions apidoc/Titanium/UI/Window.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ methods:
- name: hideNavBar
summary: Hides the navigation bar.
description: |
If the window is not displayed in a <Titanium.UI.NavigationWindow>, this method has no effect.
If the window is not displayed in a <Titanium.UI.iOS.NavigationWindow>, this method has no effect.
parameters:
- name: options
summary: |
Expand Down Expand Up @@ -85,7 +85,7 @@ methods:
- name: showNavBar
summary: Makes the navigation bar visible.
description: |
If the window is not displayed in a <Titanium.UI.NavigationWindow>, this method has no effect.
If the window is not displayed in a <Titanium.UI.iOS.NavigationWindow>, this method has no effect.
parameters:
- name: options
summary: |
Expand All @@ -98,7 +98,7 @@ methods:
- name: showToolbar
summary: Makes the bottom toolbar visible.
description: |
If the window is not displayed in a <Titanium.UI.NavigationWindow>, this method has no effect.
If the window is not displayed in a <Titanium.UI.iOS.NavigationWindow>, this method has no effect.
Note: This method is only intended to work with toolbars that are created using [setToolbar](Titanium.UI.Window.setToolbar).
It will not have any effect on toolbars added manually to the window.
parameters:
Expand All @@ -115,7 +115,7 @@ methods:
- name: hideToolbar
summary: Makes the bottom toolbar invisible.
description: |
If the window is not displayed in a <Titanium.UI.NavigationWindow>, this method has no effect.
If the window is not displayed in a <Titanium.UI.iOS.NavigationWindow>, this method has no effect.
Note: This method is only intended to work with toolbars that are created using [setToolbar](Titanium.UI.Window.setToolbar).
It will not have any effect on toolbars added manually to the window.
parameters:
Expand Down Expand Up @@ -635,12 +635,12 @@ properties:
Since Titanium SDK 6.0.0, you can use this property to hide and show the property as well.

Using this property, the navigation bar will be hidden or shown animated by default. Please note that
this property will only take effect if the window is used inside a <Titanium.UI.NavigationWindow>
this property will only take effect if the window is used inside a <Titanium.UI.iOS.NavigationWindow>
and will be ignored otherwise. If you want to hide or show the navigation without an animation, use t
he methods <Titanium.UI.Window.showNavBar> and <Titanium.UI.Window.hideNavBar> with the second parameter
to specify the animation:

// "myWindow" is a Ti.UI.Window inside a Ti.UI.NavigationWindow
// "myWindow" is a Ti.UI.Window inside a Ti.UI.iOS.NavigationWindow
myWindow.hideNavBar(true, {animated: false});

#### Android Platform Notes
Expand All @@ -664,12 +664,12 @@ properties:
platforms: [iphone,ipad]

- name: navigationWindow
summary: The <Titanium.UI.NavigationWindow> instance hosting this window.
summary: The <Titanium.UI.iOS.NavigationWindow> instance hosting this window.
description: |
Returns the navigation window that hosts this window. Returns `null` if the window is not
hosted by a navigation window.
since: "7.3.0"
type: Titanium.UI.NavigationWindow
type: Titanium.UI.iOS.NavigationWindow
permission: read-only
platforms: [iphone, ipad]

Expand Down Expand Up @@ -950,7 +950,7 @@ properties:
description: |
If `false` the user will not be able to swipe from the left edge of the window to close it.
Note: This property is only used for a window being embedded in a [Ti.UI.Tab](Titanium.UI.Tab) or
[Ti.UI.NavigationWindow](Titanium.UI.NavigationWindow). It is enabled by default.
[Ti.UI.iOS.NavigationWindow](Titanium.UI.iOS.NavigationWindow). It is enabled by default.
type: Boolean
since: "5.2.0"
platforms: [iphone,ipad]
Expand Down Expand Up @@ -1036,7 +1036,7 @@ properties:
summary: |
Array of button objects to show in the window's toolbar.
description: |
The toolbar is only shown when the window is inside a <Titanium.UI.NavigationWindow>.
The toolbar is only shown when the window is inside a <Titanium.UI.iOS.NavigationWindow>.
To display a toolbar when a window is not inside a NavigationWindow, add an instance of a
<Titanium.UI.iOS.Toolbar> to the window.

Expand Down Expand Up @@ -1074,7 +1074,7 @@ properties:
- name: transitionAnimation
summary: |
Use a transition animation when opening or closing windows in a
<Titanium.UI.NavigationWindow> or <Titanium.UI.Tab>.
<Titanium.UI.iOS.NavigationWindow> or <Titanium.UI.Tab>.
description: |
Create the transition animation using the <Titanium.UI.iOS.createTransitionAnimation>
method.
Expand Down Expand Up @@ -1350,7 +1350,7 @@ description: |
Windows *contain* other views, but in general they are not *contained* inside
other views. There are a few specialized views that manage windows:

* [NavigationWindow](Titanium.UI.NavigationWindow)
* [NavigationWindow](Titanium.UI.iOS.NavigationWindow)
* [SplitWindow](Titanium.UI.iPad.SplitWindow)
* [TabGroup](Titanium.UI.TabGroup)
* [Tab](Titanium.UI.Tab)
Expand Down Expand Up @@ -1502,7 +1502,7 @@ description: |

You can create this type of modal window on iPad with the following code snippet:

var win = Ti.UI.createNavigationWindow({
var win = Ti.UI.iOS.createNavigationWindow({
window: Ti.UI.createWindow({
title: "Modal Window"
})
Expand Down Expand Up @@ -2054,7 +2054,7 @@ examples:
- title: Simple Example
example: |

var win = Ti.UI.createWindow({
var win = Titanium.UI.createWindow({
title: 'Title',
barColor: 'yellow',
titleAttributes: {
Expand All @@ -2063,7 +2063,7 @@ examples:
shadow:{color:'gray', offset:{width:1,height:1}}
}
});
var nav = Ti.UI.createNavigationWindow({window: win});
var nav = Titanium.UI.iOS.createNavigationWindow({window: win});
nav.open();

properties:
Expand Down
2 changes: 1 addition & 1 deletion apidoc/Titanium/UI/iOS/DocumentViewer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ examples:
rightNavButton: navButton
});

var navWin = Ti.UI.createNavigationWindow({
var navWin = Ti.UI.iOS.createNavigationWindow({
window: win
});

Expand Down