Skip to content

Commit

Permalink
chore(all): update template, update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@m1ga
m1ga committed Jan 18, 2024
1 parent 92adc68 commit f2df8d6
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 489 deletions.
198 changes: 1 addition & 197 deletions lib/tiappxml.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,98 +257,6 @@ function toXml(dom, parent, name, value) {
}
break;

case 'mobileweb':
Object.keys(value).forEach(function (prop) {
switch (prop) {
case 'build':
dom.create('build', null, node, function (build) {
Object.keys(value.build).forEach(function (name) {
dom.create(name, null, build, function (deployment) {
Object.keys(value.build[name]).forEach(function (d) {
var val = value.build[name][d];
switch (d) {
case 'js':
case 'css':
case 'html':
dom.create(d, null, deployment, function (type) {
Object.keys(val).forEach(function (v) {
dom.create(v, { nodeValue: val[v] }, type);
});
});
break;

default:
dom.create(d, { nodeValue: val }, deployment);
}
});
});
});
});
break;

case 'analytics':
case 'filesystem':
case 'map':
case 'splash':
case 'unsupported-platforms':
dom.create(prop, null, node, function (section) {
Object.keys(value[prop]).forEach(function (key) {
dom.create(key, { nodeValue: value[prop][key] }, section);
});
});
break;

case 'precache':
dom.create('precache', null, node, function (precache) {
Object.keys(value[prop]).forEach(function (type) {
value[prop][type].forEach(function (n) {
dom.create(type, { nodeValue: n }, precache);
});
});
});
break;

default:
dom.create(prop, { nodeValue: value[prop] }, node);
}
});
break;

case 'tizen':
node.setAttribute('xmlns:tizen', 'http://ti.appcelerator.org');
// use default and generated values if appid and configXml are empty
value.appid && node.setAttribute('appid', value.appid);
// creating nodes from tizen specific entries
var tizenSection = new DOMParser(defaultDOMParserArgs).parseFromString('<?xml version="1.0" encoding="UTF-8"?>\n<tizen xmlns:tizen="http://ti.appcelerator.org" appid="' + value.appid + '"> ' + value.configXml + ' </tizen>', 'text/xml').documentElement,
child = tizenSection.firstChild,
nextSibl;
while (child) {
// store next sibling before calling nextSibling().
// Becaus after appendChild() nextSibling() will return node from other tree
nextSibl = child.nextSibling;
node.appendChild(child);
child = nextSibl;
}
break;

case 'windows':
Object.keys(value).forEach(function (prop) {
switch (prop) {
default:
dom.create(prop, { nodeValue: value[prop] }, node);
}
});
break;

case 'windows-phone':
Object.keys(value).forEach(function (prop) {
switch (prop) {
default:
dom.create(prop, { nodeValue: value[prop] }, node);
}
});
break;

case 'webpack':
if (value.type) {
dom.create('type', { nodeValue: value.type }, node);
Expand Down Expand Up @@ -545,27 +453,6 @@ function toJS(obj, doc) {
});
break;

case 'blackberry':
var blackberry = obj.blackberry = {};
obj.blackberry.other = '';
xml.forEachElement(node, function (elem) {
switch (elem.tagName) {
case 'permissions':
const permissions = blackberry.permissions = {};
xml.forEachElement(elem, (e) => permissions[xml.getValue(e)] = true);
break;

case 'build-id':
case 'orientation':
blackberry[elem.tagName] = xml.getValue(elem);
break;

default:
obj.blackberry.other += elem.toString() + '\n';
}
});
break;

case 'iphone':
var iphone = obj.iphone = {},
dev;
Expand Down Expand Up @@ -703,89 +590,6 @@ function toJS(obj, doc) {
});
break;

case 'mobileweb':
var mobileweb = obj.mobileweb = {};
xml.forEachElement(node, function (elem) {
switch (elem.tagName) {
case 'build':
var build = mobileweb.build = {};
xml.forEachElement(elem, function (elem) {
var profile = build[elem.tagName] = {};
xml.forEachElement(elem, function (elem) {
switch (elem.tagName) {
case 'js':
case 'css':
case 'html':
var filetype = profile[elem.tagName] = {};
xml.forEachElement(elem, function (elem) {
filetype[elem.tagName] = xml.getValue(elem);
});
break;

default:
profile[elem.tagName] = xml.getValue(elem);
}
});
});
break;

case 'analytics':
case 'filesystem':
case 'map':
case 'splash':
case 'unsupported-platforms':
mobileweb[elem.tagName] = {};
xml.forEachElement(elem, function (subelem) {
mobileweb[elem.tagName][subelem.tagName] = xml.getValue(subelem);
});
break;

case 'precache':
var precache = mobileweb.precache = {};
xml.forEachElement(elem, function (elem) {
precache[elem.tagName] || (precache[elem.tagName] = []);
precache[elem.tagName].push(xml.getValue(elem));
});
break;

default:
mobileweb[elem.tagName] = xml.getValue(elem);
}
});
break;

case 'tizen':
var tizen = obj.tizen = {
appid: undefined,
configXml: undefined
};

tizen.appid = xml.getAttr(node, 'appid');
xml.forEachElement(node, function (elem) {
tizen.configXml ? tizen.configXml = tizen.configXml + '\n' + elem.toString() : tizen.configXml = elem.toString();
});
break;

case 'windows':
var windows = obj.windows = {};
xml.forEachElement(node, function (elem) {
windows[elem.tagName] = xml.getValue(elem);
});
break;

case 'windows-phone':
var wp = obj['windows-phone'] = {};
xml.forEachElement(node, function (elem) {
switch (elem.tagName) {
case 'target-sdk':
wp[elem.tagName] = elem.firstChild && elem.firstChild.data.replace(/\n/g, '').trim() || '';
break;
default:
wp[elem.tagName] = xml.getValue(elem);
}
});
break;

case 'modules':
var modules = obj.modules = [];
xml.forEachElement(node, function (elem) {
Expand Down Expand Up @@ -876,7 +680,7 @@ function tiapp(filename) {
Object.defineProperty(this, 'toString', {
value: function (fmt) {
if (fmt === 'xml') {
var dom = new DOMParser(defaultDOMParserArgs).parseFromString('<ti:app xmlns:ti="http://ti.appcelerator.org"/>', 'text/xml');
var dom = new DOMParser(defaultDOMParserArgs).parseFromString('<ti:app xmlns:ti="http://ti.tidev.io"/>', 'text/xml');

dom.create = function (tag, attrs, parent, callback) {
var node = dom.createElement(tag),
Expand Down
6 changes: 1 addition & 5 deletions lib/titanium.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports.availablePlatformsNames = (function (platforms) {
});
return platforms.sort();
}(manifest.platforms || []));
exports.allPlatformNames = [ 'android', 'ios', 'iphone', 'ipad', 'mobileweb', 'blackberry', 'windows', 'tizen' ];
exports.allPlatformNames = [ 'android', 'ios', 'iphone', 'ipad' ];

exports.commonOptions = function (logger, config) {
return {
Expand Down Expand Up @@ -489,10 +489,6 @@ exports.validateCorrectSDK = function (logger, config, cli, commandName) {
}
break;

case 'mobileweb':
cmdAdd(argv['project-dir'], argv['deploy-type']);
break;

case 'android':
if (argv['build-only']) {
cmdAdd('build', tiapp.name, argv['android-sdk'], argv['project-dir'], tiapp.id);
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/tiapp1.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ti:app xmlns:ti="http://ti.appcelerator.org">
<ti:app xmlns:ti="http://ti.tidev.io">
<id>ti.testapp</id>
<name>testapp</name>
<version>1.0</version>
Expand Down
107 changes: 1 addition & 106 deletions tests/resources/tiapp2.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<ti:app xmlns:ti="http://ti.appcelerator.org">
<ti:app xmlns:ti="http://ti.tidev.io">
<deployment-targets>
<target device="mobileweb">true</target>
<target device="iphone">true</target>
<target device="ipad">true</target>
<target device="android">true</target>
<target device="blackberry">false</target>
</deployment-targets>
<sdk-version>2.2.0</sdk-version>
<id>ti.testapp</id>
Expand Down Expand Up @@ -199,36 +197,6 @@
</type>
</types>
</iphone>
<blackberry>
<orientation>auto</orientation>
<build-id>1</build-id>
<permissions>
<permission>access_shared</permission>
<permission>record_audio</permission>
<permission>use_camera</permission>
<permission>access_internet</permission>
<permission>play_audio</permission>
<permission>post_notification</permission>
<permission>set_audio_volume</permission>
<permission>read_device_identifying_information</permission>
</permissions>
<permission system="true">run_native</permission>
<permission system="true">_sys_use_consumer_push</permission>
<invoke-target id="ti.testapp.invoke.push">
<type>APPLICATION</type>
<filter>
<action>bb.action.PUSH</action>
<mime-type>application/vnd.push</mime-type>
</filter>
</invoke-target>
<invoke-target id="ti.testapp.invoke.open">
<type>APPLICATION</type>
<filter>
<action>bb.action.OPEN</action>
<mime-type>text/plain</mime-type>
</filter>
</invoke-target>
</blackberry>
<android xmlns:android="http://schemas.android.com/apk/res/android">
<manifest>
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17" android:maxSdkVersion="18"/>
Expand Down Expand Up @@ -259,79 +227,6 @@
<service type="interval" url="testservice.js"/>
</services>
</android>
<mobileweb>
<build>
<production>
<action>clean</action>
<js>
<minify>true</minify>
<keep-line-breaks>false</keep-line-breaks>
<keep-comments>false</keep-comments>
<keep-uncompressed>false</keep-uncompressed>
<log-inject-filename-lineno>false</log-inject-filename-lineno>
<ti-log-level>warn</ti-log-level>
<console-log-level>warn</console-log-level>
</js>
<css>
<minify>true</minify>
<keep-line-breaks>false</keep-line-breaks>
<keep-comments>false</keep-comments>
<keep-uncompressed>false</keep-uncompressed>
<inline-images>false</inline-images>
<inline-imports>true</inline-imports>
</css>
<html>
<minify>true</minify>
<keep-line-breaks>false</keep-line-breaks>
<keep-comments>false</keep-comments>
<keep-uncompressed>false</keep-uncompressed>
<inline-js>true</inline-js>
<inline-css>true</inline-css>
<strip-attribute-quotes>false</strip-attribute-quotes>
</html>
<precache-modules>true</precache-modules>
<precache-includes>true</precache-includes>
</production>
</build>
<analytics>
<use-xhr>false</use-xhr>
</analytics>
<base-url></base-url>
<disable-error-screen>true</disable-error-screen>
<filesystem>
<backend>Ti/_/Filesystem/Local</backend>
<registry>preload</registry>
</filesystem>
<force-absolute-paths>true</force-absolute-paths>
<instrumentation>true</instrumentation>
<main>app.js</main>
<map>
<apikey>API_KEY_GOES_HERE</apikey>
<backend>Ti/_/Map/Google</backend>
</map>
<precache>
<image>/assets/myImage.png</image>
<image>/assets/myImage2.png</image>
<include>/myapp/mylib.js</include>
<include>/myapp/mylib2.js</include>
<locale>en</locale>
<locale>es</locale>
<locale>fr</locale>
<locale>de</locale>
<require>myapp/mymodule</require>
<require>myapp/mymodule2</require>
</precache>
<splash>
<enabled>true</enabled>
<inline-css-images>true</inline-css-images>
<duration>1000</duration>
</splash>
<theme>default</theme>
<unsupported-platforms>
<display-warning>true</display-warning>
<allow-loading>true</allow-loading>
</unsupported-platforms>
</mobileweb>
<webpack>
<type>alloy</type>
<transpile-dependencies>
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/tiapp3.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ti:app xmlns:ti="http://ti.appcelerator.org">
<ti:app xmlns:ti="http://ti.tidev.io">
<android xmlns:android="http://schemas.android.com/apk/res/android">
<manifest>
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/tiapp4.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ti:app xmlns:ti="http://ti.appcelerator.org">
<ti:app xmlns:ti="http://ti.tidev.io">
<id>ti.testapp</id>
<name>testapp</name>
<version>1.0</version>
Expand Down
Loading

0 comments on commit f2df8d6

Please sign in to comment.