Skip to content

Commit 5e1811b

Browse files
author
fairwinds
committed
some more namespace changes and updating the CHANGES.txt for Network.addConnectivityListener
1 parent a809854 commit 5e1811b

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

CHANGES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ x.y (release unknown - yyyy-mm-dd)
1313
- window.Titanium renamed to window.Ti
1414
- Titanium.Include() method removed
1515
- Titanium.Network.online removed (was deprecated in 1.2.0-RC4)
16-
16+
- Titanium.Network.addConnectivityListener removed (was deprecated in 1.2.0-RC4)

SConscript.docs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ build.env.Append(BUILDERS = {'Textmate' : Builder(
7272
target_factory=SCons.Node.FS.default_fs.Dir,
7373
multi=0)})
7474

75-
tm_out = path.join(build.dir, 'Titanium.tmbundle')
75+
tm_out = path.join(build.dir, 'TideSDK.tmbundle')
7676
textmatet = build.env.Textmate(tm_out, [api_out])
7777
Alias('textmate', textmatet)
78-
AlwaysBuild(textmatet)
78+
AlwaysBuild(textmatet)

tests/modules/app/app.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ describe("appURLToPath", function () {
22
var appURLPath;
33

44
beforeEach(function () {
5-
appURLPath = Titanium.App.appURLToPath("app://index.html");
5+
appURLPath = Ti.App.appURLToPath("app://index.html");
66
});
77

88
it("return a valid absolute file path for an app URL", function () {
9-
var file = Titanium.Filesystem.getFile(appURLPath);
9+
var file = Ti.Filesystem.getFile(appURLPath);
1010
expect(file.exists()).toBe(true);
1111
});
1212

1313
it("returns a valid path even if the URL has a host in it", function () {
1414
// See Lighthouse ticket #90 for more details.
15-
var appURLWithHost = Titanium.UI.getCurrentWindow().getURL(),
16-
appURLPathWithHost = Titanium.App.appURLToPath(appURLWithHost);
15+
var appURLWithHost = Ti.UI.getCurrentWindow().getURL(),
16+
appURLPathWithHost = Ti.App.appURLToPath(appURLWithHost);
1717
expect(appURLPathWithHost).toEqual(appURLPath);
1818
});
1919
});
@@ -23,33 +23,33 @@ xdescribe("exit", function () {});
2323

2424
describe("getArguments", function () {
2525
it("should return two arguments", function () {
26-
expect(Titanium.App.getArguments().length).toBe(2);
26+
expect(Ti.App.getArguments().length).toBe(2);
2727
});
2828
});
2929

3030
describe("getCopyright", function () {
3131
it("returns the copyright specified in the tiapp.xml file", function () {
32-
expect(Titanium.App.getCopyright()).toEqual("2010 by Appcelerator");
32+
expect(Ti.App.getCopyright()).toEqual("2010 by Appcelerator");
3333
});
3434
});
3535

3636
describe("getDescription", function () {
3737
it("returns the description specified in the tiapp.xml file", function () {
38-
expect(Titanium.App.getDescription()).toEqual("A testing harness for Titanium");
38+
expect(Ti.App.getDescription()).toEqual("A testing harness for Ti");
3939
});
4040
});
4141

4242
describe("getGUID", function () {
4343
it("returns the application's GUID", function () {
44-
expect(Titanium.App.getGUID()).toEqual("5FDFCB8A-CD45-423F-BF0C-01B025A07D34");
44+
expect(Ti.App.getGUID()).toEqual("5FDFCB8A-CD45-423F-BF0C-01B025A07D34");
4545
});
4646
});
4747

4848
describe("getHome", function () {
4949
var appHomeDir;
5050

5151
beforeEach(function () {
52-
appHomeDir = Titanium.Filesystem.getFile(Titanium.App.getHome());
52+
appHomeDir = Ti.Filesystem.getFile(Ti.App.getHome());
5353
});
5454

5555
it("provides the application home directory", function () {
@@ -66,31 +66,31 @@ xdescribe("getIcon", function () {});
6666

6767
describe("getName", function () {
6868
it("returns the name of the application", function () {
69-
expect(Titanium.App.getName()).toEqual("Drillbit");
69+
expect(Ti.App.getName()).toEqual("Drillbit");
7070
});
7171
});
7272

7373
describe("getPath", function () {
7474
it("returns an absolute path to the application's executable", function () {
75-
var appPath = Titanium.App.getPath();
76-
expect(Titanium.Filesystem.getFile(appPath).exists()).toBe(true);
75+
var appPath = Ti.App.getPath();
76+
expect(Ti.Filesystem.getFile(appPath).exists()).toBe(true);
7777
});
7878
});
7979

8080
describe("getPublisher", function () {
8181
it("returns the name of the publisher of this application", function () {
82-
expect(Titanium.App.getPublisher()).toEqual("Appcelerator");
82+
expect(Ti.App.getPublisher()).toEqual("Appcelerator");
8383
});
8484
});
8585

8686
describe("getApplication", function () {
8787
it("returns the URL of this application", function () {
88-
expect(Titanium.App.getURL()).toEqual("appcelerator.com");
88+
expect(Ti.App.getURL()).toEqual("appcelerator.com");
8989
});
9090
});
9191

9292
describe("getVersion", function () {
9393
it("returns the version of the application", function () {
94-
expect(Titanium.App.getVersion()).toEqual("1.0");
94+
expect(Ti.App.getVersion()).toEqual("1.0");
9595
});
9696
});

tests/modules/app/properties.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ describe("Properties", function () {
44
describe("given a properties object initialized with some values", function () {
55

66
beforeEach(function () {
7-
properties = Titanium.App.createProperties({
7+
properties = Ti.App.createProperties({
88
'double': 1.123456,
99
'int': 1,
1010
'list': ["a", "b", "c"],
@@ -74,7 +74,7 @@ describe("Properties", function () {
7474
describe("loading properties from a file", function () {
7575
beforeEach(function () {
7676
var path = Drillbit.testDirectory.nativePath() + "/properties.txt";
77-
properties = Titanium.App.loadProperties(path);
77+
properties = Ti.App.loadProperties(path);
7878
});
7979

8080
it("should have a 'int' property with an integer value", function () {

tests/modules/codec.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ var testString = "Only two things are infinite, the universe and human stupidity
44

55
describe("checksum", function () {
66
it("returns the correct checksum using the default algorithm", function () {
7-
expect(Titanium.Codec.checksum(testString)).toEqual("B2B0664C");
7+
expect(Ti.Codec.checksum(testString)).toEqual("B2B0664C");
88
});
99

1010
it("returns the correct checksum using crc32 alogrithm", function () {
11-
expect(Titanium.Codec.checksum(testString, Titanium.Codec.CRC32)).toEqual(2997904972);
11+
expect(Ti.Codec.checksum(testString, Ti.Codec.CRC32)).toEqual(2997904972);
1212
});
1313

1414
it("returns the correct checksum using ADLER32 algorithm", function () {
15-
expect(Titanium.Codec.checksum(testString, Titanium.Codec.ADLER32)).toEqual(3417123301);
15+
expect(Ti.Codec.checksum(testString, Ti.Codec.ADLER32)).toEqual(3417123301);
1616
});
1717
});
1818

@@ -23,24 +23,24 @@ xdescribe("createZip", function () {
2323
describe("decodeBase64", function () {
2424
// FIXME: appears our impl is putting newlines in the hash causing these tests to fail.
2525
it("returns the original string that was base 64 encoded", function () {
26-
expect(Titanium.Codec.decodeBase64(base64Encoded)).toEqual(testString);
26+
expect(Ti.Codec.decodeBase64(base64Encoded)).toEqual(testString);
2727
});
2828
});
2929

3030
describe("encodeBase64", function () {
3131
it("returns the base 64 encoded string", function () {
32-
expect(Titanium.Codec.encodeBase64(testString)).toEqual(base64Encoded);
32+
expect(Ti.Codec.encodeBase64(testString)).toEqual(base64Encoded);
3333
});
3434
});
3535

3636
describe("decodeHexBinary", function () {
3737
it("returns the original string that was hex encoded", function () {
38-
expect(Titanium.Codec.decodeHexBinary(hexEncoded)).toEqual(testString);
38+
expect(Ti.Codec.decodeHexBinary(hexEncoded)).toEqual(testString);
3939
});
4040
});
4141

4242
describe("encodeHexBinary", function () {
4343
it("returns the hex encoded string", function () {
44-
expect(Titanium.Codec.encodeHexBinary(testString)).toEqual(hexEncoded);
44+
expect(Ti.Codec.encodeHexBinary(testString)).toEqual(hexEncoded);
4545
});
4646
});

0 commit comments

Comments
 (0)