Repository: cordova-app-harness Updated Branches: refs/heads/master 7bcfa09d7 -> ba3cb0edf
Delete dead code & add "all" bucket to PluginMetadata results Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/54781c3e Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/54781c3e Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/54781c3e Branch: refs/heads/master Commit: 54781c3e87063512d0767a46fa6ec32f4140a8a8 Parents: 7bcfa09 Author: Andrew Grieve <[email protected]> Authored: Wed May 28 17:05:36 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Wed May 28 17:05:36 2014 -0400 ---------------------------------------------------------------------- www/cdvah/js/PluginMetadata.js | 18 ++++++++---------- www/cdvah/js/app.js | 10 ---------- 2 files changed, 8 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/54781c3e/www/cdvah/js/PluginMetadata.js ---------------------------------------------------------------------- diff --git a/www/cdvah/js/PluginMetadata.js b/www/cdvah/js/PluginMetadata.js index ead8dd8..f255b23 100644 --- a/www/cdvah/js/PluginMetadata.js +++ b/www/cdvah/js/PluginMetadata.js @@ -60,24 +60,22 @@ matched: [], missing: [], newer: [], // Those dependencies which are newer in the child than the harness. - older: [] // And those which are older in the child than the harness. + older: [], // And those which are older in the child than the harness. + all: [] }; - if (!childPlugins) { - results.raw = {}; - return results; - } - Object.keys(childPlugins).forEach(function(plugin) { + var version = childPlugins[plugin]; + results.all.push({ id: plugin, version: version }); if (!harnessPluginMetadata[plugin]) { - results.missing.push({ id: plugin, version: childPlugins[plugin] }); + results.missing.push({ id: plugin, version: version }); } else { - switch(semverCompare(harnessPluginMetadata[plugin], childPlugins[plugin])) { + switch(semverCompare(harnessPluginMetadata[plugin], version)) { case -1: // Child older. - results.older.push({ id: plugin, versions: { harness: harnessPluginMetadata[plugin], child: childPlugins[plugin] } }); + results.older.push({ id: plugin, versions: { harness: harnessPluginMetadata[plugin], child: version } }); break; case 1: // Child newer. - results.newer.push({ id: plugin, versions: { harness: harnessPluginMetadata[plugin], child: childPlugins[plugin] } }); + results.newer.push({ id: plugin, versions: { harness: harnessPluginMetadata[plugin], child: version } }); break; case 0: // Match! results.matched.push({ id: plugin, version: harnessPluginMetadata[plugin] }); http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/54781c3e/www/cdvah/js/app.js ---------------------------------------------------------------------- diff --git a/www/cdvah/js/app.js b/www/cdvah/js/app.js index b111394..864398b 100644 --- a/www/cdvah/js/app.js +++ b/www/cdvah/js/app.js @@ -33,16 +33,6 @@ myApp.config(['$routeProvider', function($routeProvider){ }); }]); -myApp.factory('urlCleanup', function() { - return function(url) { - url = url.replace(/\/$/, '').replace(new RegExp(cordova.platformId + '$'), '').replace(/\/$/, ''); - if (!/^(file|http|https)+:/.test(url)) { - url = 'http://' + url; - } - return url; - }; -}); - document.addEventListener('deviceready', function() { myApp.value('INSTALL_DIRECTORY', cordova.file.dataDirectory + 'apps/'); myApp.value('APPS_JSON', cordova.file.dataDirectory + 'apps.json');
