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

[ALOY-1273] Code documentation contains links to out-dated Titanium docs #735

Merged
merged 2 commits into from Oct 20, 2015
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
2 changes: 1 addition & 1 deletion Alloy/commands/extract-i18n/index.js
@@ -1,6 +1,6 @@
/*
Corresponds to `alloy extract-i18n` command.
http://docs.appcelerator.com/titanium/latest/#!/guide/Alloy_Tasks_with_the_CLI-section-37536785_AlloyTaskswiththeCLI-Extractinglocalizationstrings
http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Tasks_with_the_CLI-section-37536785_AlloyTaskswiththeCLI-Extractinglocalizationstrings
*/
var fs = require('fs'),
path = require('path'),
Expand Down
2 changes: 1 addition & 1 deletion Alloy/commands/generate/index.js
@@ -1,6 +1,6 @@
/*
Corresponds to the `alloy generate *` command.
http://docs.appcelerator.com/titanium/latest/#!/guide/Alloy_Tasks_with_the_CLI-section-37536785_AlloyTaskswiththeCLI-GeneratingComponents
http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Tasks_with_the_CLI-section-37536785_AlloyTaskswiththeCLI-GeneratingComponents

Actual component generators are defined in the targets folder
*/
Expand Down
2 changes: 1 addition & 1 deletion Alloy/lib/alloy.js
Expand Up @@ -21,7 +21,7 @@
* interact with the View and Model components of the application or widget.
*
* For guides on using Alloy, see
* [Alloy Framework](http://docs.appcelerator.com/titanium/latest/#!/guide/Alloy_Framework).
* [Alloy Framework](http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Framework).
*/
var _ = require('alloy/underscore')._,
Backbone = require('alloy/backbone'),
Expand Down
2 changes: 1 addition & 1 deletion Alloy/template/app.tss
Expand Up @@ -5,7 +5,7 @@ here will be applied throughout your app. However, these rules
have the lowest priority of any style settings.

For more information, see the "Style Priorities" section of
http://docs.appcelerator.com/titanium/latest/#!/guide/Alloy_Styles_and_Themes
http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Styles_and_Themes

For example, the following would apply to all labels, windows,
and text fields (depending on platform) in your app unless you
Expand Down
66 changes: 33 additions & 33 deletions CHANGELOG.md

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions README.md
Expand Up @@ -11,8 +11,8 @@ Alloy is an MVC application framework by [Appcelerator](http://www.appcelerator.

## Getting Started

* [Quick Start Guide](http://docs.appcelerator.com/titanium/latest/#!/guide/Alloy_Quick_Start) that covers _everything_ from installation to building your first app with Alloy.
* Complete collection of [Alloy Guides](http://docs.appcelerator.com/titanium/latest/#!/guide/Alloy_Framework)
* [Quick Start Guide](http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Quick_Start) that covers _everything_ from installation to building your first app with Alloy.
* Complete collection of [Alloy Guides](http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Framework)
* [Collection of test apps](https://github.com/appcelerator/alloy/tree/master/test/apps) showing various aspects of Alloy in practice.

## Installation
Expand Down Expand Up @@ -146,4 +146,3 @@ To protect the interests of the Alloy contributors, Appcelerator, customers and

Alloy is developed by Appcelerator and the community and is Copyright (c) 2012 by Appcelerator, Inc. All Rights Reserved.
Alloy is made available under the Apache Public License, version 2. See the [LICENSE](https://github.com/appcelerator/alloy/blob/master/LICENSE) file for more information.

2 changes: 1 addition & 1 deletion docs/apidoc/widgets.js
Expand Up @@ -7,7 +7,7 @@
* Note that to use the methods list below, the correct namespace is `Widget.create*` not
* `Alloy.Widget.create*`.
*
* For more information on widgets, see [Alloy Widgets](http://docs.appcelerator.com/titanium/latest/#!/guide/Alloy_Widgets).
* For more information on widgets, see [Alloy Widgets](http://docs.appcelerator.com/platform/latest/#!/guide/Alloy_Widgets).
*
* #### Creating a Widget
*
Expand Down
2 changes: 1 addition & 1 deletion hooks/README.md
Expand Up @@ -5,4 +5,4 @@ This directory contains plugins used by the CLI to process Alloy projects:
* alloy.js -- This is the main Alloy plugin. This hooks into the CLI at the `build.pre.compile` stage to perform the `alloy compile` operation. The Alloy compile generates the set of files in the Resources directory which the CLI then compiles into the finished app.
* deepclean.js -- This hook extends the `ti clean` command for Alloy projects, emptying both the build and Resources directories.

For more information on CLI hooks, see the [Titanium CLI Plugins](http://docs.appcelerator.com/titanium/latest/#!/guide/Titanium_CLI_Plugins) guide.
For more information on CLI hooks, see the [Titanium CLI Plugins](http://docs.appcelerator.com/platform/latest/#!/guide/Titanium_CLI_Plugins) guide.
11 changes: 5 additions & 6 deletions jakelib/readme.md
Expand Up @@ -13,7 +13,7 @@ jake app:run dir=ui/tableview
```

## Arguments and options
You can pass any command-line argument supported by the `ti build` command (see <a href="http://docs.appcelerator.com/titanium/latest/#!/guide/Titanium_Command-Line_Interface_Reference-section-35619828_TitaniumCommand-LineInterfaceReference-Build">the docs</a>) with these caveats:
You can pass any command-line argument supported by the `ti build` command (see <a href="http://docs.appcelerator.com/platform/latest/#!/guide/Titanium_Command-Line_Interface_Reference-section-35619828_TitaniumCommand-LineInterfaceReference-Build">the docs</a>) with these caveats:

* Do _not_ include the single or double-dashes specified by the `ti build` command docs.
* You _must_ separate the argument and values with an **equals sign**, not a space.
Expand All @@ -23,7 +23,7 @@ You can pass any command-line argument supported by the `ti build` command (see

## Xcode 6 / targeting specific simulators

Starting with SDK 3.4.0 and Xcode 6, you must target a desired simulator by its UUID.
Starting with SDK 3.4.0 and Xcode 6, you must target a desired simulator by its UUID.

```bash
# to get a list of UUIDs
Expand Down Expand Up @@ -52,16 +52,15 @@ In your repo clone, you will find many test apps that correspond to Alloy Jira t

```bash
# for the Jira apps, the dir= part is optional
jake app:run dir=ALOY-1000
jake app:run dir=ALOY-1000
```



## Note: SDK / Titanium version

The `sdk` argument to `ti build` specifies the version of the CLI that will be used to parse the tiapp.xml file. It does not override the sdk-version value specified in the tiapp.xml.
The `sdk` argument to `ti build` specifies the version of the CLI that will be used to parse the tiapp.xml file. It does not override the sdk-version value specified in the tiapp.xml.

However, for **the Alloy testing apps only**, that argument will specify the sdk-version. That's because those testing apps do not have an &lt;sdk-version> tag in their tiapp.xml file (see projects/HarnessTemplate/tiapp.xml).
However, for **the Alloy testing apps only**, that argument will specify the sdk-version. That's because those testing apps do not have an &lt;sdk-version> tag in their tiapp.xml file (see projects/HarnessTemplate/tiapp.xml).

For the Alloy test apps, the SDK version used to build your apps is determined by either the command-line argument you supply to the `jake` command or the value you have set with the `ti sdk select` command.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -14,7 +14,7 @@
"mobileweb",
"appc-client"
],
"version": "1.7.20",
"version": "1.7.21",
"author": "Appcelerator, Inc. <info@appcelerator.com>",
"maintainers": [
{
Expand Down
2 changes: 1 addition & 1 deletion samples/mapping/controllers/index.js
Expand Up @@ -10,7 +10,7 @@
that has been registered to a Google account and has Play Services installed.

Additional information is in the documentation:
http://docs.appcelerator.com/titanium/latest/#!/guide/Google_Maps_v2_for_Android
http://docs.appcelerator.com/platform/latest/#!/guide/Google_Maps_v2_for_Android
*/

$.addAddress.on('addAnnotation', function(e) {
Expand Down