Repository: cordova-lib Updated Branches: refs/heads/master ffc17dd1b -> 6f7a67a78
CB-6954: Share events.js between cordova and plugman github: close #31 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/6f7a67a7 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/6f7a67a7 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/6f7a67a7 Branch: refs/heads/master Commit: 6f7a67a78ceb9a6957e9b665ff935c72b2398c09 Parents: ffc17dd Author: sgrebnov <[email protected]> Authored: Tue Jun 17 17:32:24 2014 +0400 Committer: Mark Koudritsky <[email protected]> Committed: Tue Jun 17 12:45:32 2014 -0400 ---------------------------------------------------------------------- cordova-lib/spec-cordova/create.spec.js | 2 +- cordova-lib/spec-cordova/platform.spec.js | 2 +- cordova-lib/spec-cordova/plugin.spec.js | 2 +- cordova-lib/spec-plugman/install.spec.js | 2 +- cordova-lib/spec-plugman/uninstall.spec.js | 2 +- .../spec-plugman/util/config-changes.spec.js | 2 +- cordova-lib/src/cordova/cordova.js | 2 +- cordova-lib/src/cordova/create.js | 2 +- cordova-lib/src/cordova/events.js | 23 -------------------- cordova-lib/src/cordova/hooker.js | 2 +- cordova-lib/src/cordova/lazy_load.js | 2 +- .../cordova/metadata/amazon_fireos_parser.js | 2 +- .../src/cordova/metadata/android_parser.js | 2 +- .../src/cordova/metadata/blackberry10_parser.js | 2 +- .../src/cordova/metadata/firefoxos_parser.js | 2 +- cordova-lib/src/cordova/metadata/ios_parser.js | 2 +- .../src/cordova/metadata/ubuntu_parser.js | 2 +- .../src/cordova/metadata/windows8_parser.js | 3 +-- cordova-lib/src/cordova/metadata/wp8_parser.js | 2 +- cordova-lib/src/cordova/platform.js | 2 +- cordova-lib/src/cordova/plugin.js | 2 +- cordova-lib/src/cordova/prepare.js | 2 +- cordova-lib/src/cordova/restore.js | 2 +- cordova-lib/src/cordova/save.js | 2 +- cordova-lib/src/cordova/superspawn.js | 2 +- cordova-lib/src/events.js | 19 ++++++++++++++++ cordova-lib/src/plugman/events.js | 20 ----------------- cordova-lib/src/plugman/fetch.js | 2 +- cordova-lib/src/plugman/install.js | 2 +- .../src/plugman/platforms/amazon-fireos.js | 2 +- cordova-lib/src/plugman/platforms/android.js | 2 +- .../src/plugman/platforms/blackberry10.js | 2 +- cordova-lib/src/plugman/platforms/firefoxos.js | 2 +- cordova-lib/src/plugman/platforms/ios.js | 2 +- cordova-lib/src/plugman/platforms/tizen.js | 2 +- cordova-lib/src/plugman/platforms/ubuntu.js | 2 +- cordova-lib/src/plugman/platforms/windows8.js | 2 +- cordova-lib/src/plugman/platforms/wp8.js | 2 +- cordova-lib/src/plugman/plugman.js | 2 +- cordova-lib/src/plugman/prepare-browserify.js | 2 +- cordova-lib/src/plugman/prepare.js | 2 +- cordova-lib/src/plugman/uninstall.js | 2 +- cordova-lib/src/plugman/util/action-stack.js | 2 +- cordova-lib/src/plugman/util/config-changes.js | 2 +- cordova-lib/src/plugman/util/plugins.js | 2 +- cordova-lib/src/plugman/util/w8jsproj.js | 2 +- 46 files changed, 62 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/spec-cordova/create.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/create.spec.js b/cordova-lib/spec-cordova/create.spec.js index 7222e18..47bb2af 100644 --- a/cordova-lib/spec-cordova/create.spec.js +++ b/cordova-lib/spec-cordova/create.spec.js @@ -23,7 +23,7 @@ var helpers = require('./helpers'), shell = require('shelljs'), Q = require('q'), config = require('../src/cordova/config'), - events = require('../src/cordova/events'), + events = require('../src/events'), util = require('../src/cordova/util'), ConfigParser = require('../src/configparser/ConfigParser'), cordova = require('../src/cordova/cordova'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/spec-cordova/platform.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/platform.spec.js b/cordova-lib/spec-cordova/platform.spec.js index 4996b67..d92a50c 100644 --- a/cordova-lib/spec-cordova/platform.spec.js +++ b/cordova-lib/spec-cordova/platform.spec.js @@ -25,7 +25,7 @@ var helpers = require('./helpers'), superspawn = require('../src/cordova/superspawn'), config = require('../src/cordova/config'), Q = require('q'), - events = require('../src/cordova/events'), + events = require('../src/events'), cordova = require('../src/cordova/cordova'); var tmpDir = helpers.tmpDir('platform_test'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/spec-cordova/plugin.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-cordova/plugin.spec.js b/cordova-lib/spec-cordova/plugin.spec.js index 20b6d15..3cce8bd 100644 --- a/cordova-lib/spec-cordova/plugin.spec.js +++ b/cordova-lib/spec-cordova/plugin.spec.js @@ -22,7 +22,7 @@ var helpers = require('./helpers'), fs = require('fs'), shell = require('shelljs'), Q = require('q'), - events = require('../src/cordova/events'), + events = require('../src/events'), cordova = require('../src/cordova/cordova'); var tmpDir = helpers.tmpDir('plugin_test'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/spec-plugman/install.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-plugman/install.spec.js b/cordova-lib/spec-plugman/install.spec.js index cece2ea..8266d20 100644 --- a/cordova-lib/spec-plugman/install.spec.js +++ b/cordova-lib/spec-plugman/install.spec.js @@ -20,7 +20,7 @@ var install = require('../src/plugman/install'), actions = require('../src/plugman/util/action-stack'), config_changes = require('../src/plugman/util/config-changes'), xml_helpers = require('../src/util/xml-helpers'), - events = require('../src/plugman/events'), + events = require('../src/events'), plugman = require('../src/plugman/plugman'), platforms = require('../src/plugman/platforms/common'), common = require('./common'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/spec-plugman/uninstall.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-plugman/uninstall.spec.js b/cordova-lib/spec-plugman/uninstall.spec.js index ff79e4a..8b5593e 100644 --- a/cordova-lib/spec-plugman/uninstall.spec.js +++ b/cordova-lib/spec-plugman/uninstall.spec.js @@ -20,7 +20,7 @@ var uninstall = require('../src/plugman/uninstall'), install = require('../src/plugman/install'), actions = require('../src/plugman/util/action-stack'), config_changes = require('../src/plugman/util/config-changes'), - events = require('../src/plugman/events'), + events = require('../src/events'), plugman = require('../src/plugman/plugman'), common = require('./common'), fs = require('fs'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/spec-plugman/util/config-changes.spec.js ---------------------------------------------------------------------- diff --git a/cordova-lib/spec-plugman/util/config-changes.spec.js b/cordova-lib/spec-plugman/util/config-changes.spec.js index 3b72a55..c7137ee 100644 --- a/cordova-lib/spec-plugman/util/config-changes.spec.js +++ b/cordova-lib/spec-plugman/util/config-changes.spec.js @@ -25,7 +25,7 @@ var configChanges = require('../../src/plugman/util/config-changes'), fs = require('fs'), os = require('osenv'), plugman = require('../../src/plugman/plugman'), - events = require('../../src/plugman/events'), + events = require('../../src/events'), et = require('elementtree'), path = require('path'), plist = require('plist-with-patches'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/cordova.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/cordova.js b/cordova-lib/src/cordova/cordova.js index bb21f07..b8a494c 100644 --- a/cordova-lib/src/cordova/cordova.js +++ b/cordova-lib/src/cordova/cordova.js @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. */ -var cordova_events = require('./events'); +var cordova_events = require('../events'); var cordova_util = require('./util'); var off = function() { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/create.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/create.js b/cordova-lib/src/cordova/create.js index 54debe7..e5187a4 100644 --- a/cordova-lib/src/cordova/create.js +++ b/cordova-lib/src/cordova/create.js @@ -21,7 +21,7 @@ var path = require('path'), fs = require('fs'), shell = require('shelljs'), platforms = require('./platforms'), - events = require('./events'), + events = require('../events'), config = require('./config'), lazy_load = require('./lazy_load'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/events.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/events.js b/cordova-lib/src/cordova/events.js deleted file mode 100644 index be40fec..0000000 --- a/cordova-lib/src/cordova/events.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. -*/ -var events = require('events'); - -var emitter = new events.EventEmitter(); - -module.exports = emitter; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/hooker.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/hooker.js b/cordova-lib/src/cordova/hooker.js index a02d5b6..62dde30 100644 --- a/cordova-lib/src/cordova/hooker.js +++ b/cordova-lib/src/cordova/hooker.js @@ -19,7 +19,7 @@ var util = require('./util'), fs = require('fs'), os = require('os'), - events= require('./events'), + events= require('../events'), superspawn = require('./superspawn'), CordovaError = require('../CordovaError'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/lazy_load.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/lazy_load.js b/cordova-lib/src/cordova/lazy_load.js index 875364e..8c9da20 100644 --- a/cordova-lib/src/cordova/lazy_load.js +++ b/cordova-lib/src/cordova/lazy_load.js @@ -26,7 +26,7 @@ var path = require('path'), shell = require('shelljs'), platforms = require('./platforms'), npmconf = require('npmconf'), - events = require('./events'), + events = require('../events'), request = require('request'), config = require('./config'), hooker = require('./hooker'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js index 16c2f26..0a6d364 100644 --- a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js +++ b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js @@ -20,7 +20,7 @@ var fs = require('fs'), path = require('path'), xml = require('../../util/xml-helpers'), util = require('../util'), - events = require('../events'), + events = require('../../events'), shell = require('shelljs'), project_config= require('../config'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/android_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js index fd0c498..ba6638e 100644 --- a/cordova-lib/src/cordova/metadata/android_parser.js +++ b/cordova-lib/src/cordova/metadata/android_parser.js @@ -20,7 +20,7 @@ var fs = require('fs'), path = require('path'), xml = require('../../util/xml-helpers'), util = require('../util'), - events = require('../events'), + events = require('../../events'), shell = require('shelljs'), project_config= require('../config'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/blackberry10_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/blackberry10_parser.js b/cordova-lib/src/cordova/metadata/blackberry10_parser.js index dca1da3..7135524 100644 --- a/cordova-lib/src/cordova/metadata/blackberry10_parser.js +++ b/cordova-lib/src/cordova/metadata/blackberry10_parser.js @@ -24,7 +24,7 @@ var fs = require('fs'), child_process = require('child_process'), ConfigParser = require('../../configparser/ConfigParser'), CordovaError = require('../../CordovaError'), - events = require('../events'), + events = require('../../events'), config = require('../config'); module.exports = function blackberry_parser(project) { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/firefoxos_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/firefoxos_parser.js b/cordova-lib/src/cordova/metadata/firefoxos_parser.js index d21b83f..02238a1 100644 --- a/cordova-lib/src/cordova/metadata/firefoxos_parser.js +++ b/cordova-lib/src/cordova/metadata/firefoxos_parser.js @@ -19,7 +19,7 @@ var fs = require('fs'), path = require('path'), shell = require('shelljs'), - events = require('../events'), + events = require('../../events'), util = require('../util'), Q = require('q'), ConfigParser = require('../../configparser/ConfigParser'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/ios_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/ios_parser.js b/cordova-lib/src/cordova/metadata/ios_parser.js index ce6ccc8..e5d2a67 100644 --- a/cordova-lib/src/cordova/metadata/ios_parser.js +++ b/cordova-lib/src/cordova/metadata/ios_parser.js @@ -21,7 +21,7 @@ var fs = require('fs'), path = require('path'), xcode = require('xcode'), util = require('../util'), - events = require('../events'), + events = require('../../events'), shell = require('shelljs'), plist = require('plist-with-patches'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/ubuntu_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/ubuntu_parser.js b/cordova-lib/src/cordova/metadata/ubuntu_parser.js index c1e1221..82e106d 100644 --- a/cordova-lib/src/cordova/metadata/ubuntu_parser.js +++ b/cordova-lib/src/cordova/metadata/ubuntu_parser.js @@ -22,7 +22,7 @@ var fs = require('fs'), et = require('elementtree'), xml = require('../../util/xml-helpers'), util = require('../util'), - events = require('../events'), + events = require('../../events'), shell = require('shelljs'), project_config= require('../config'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/windows8_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/windows8_parser.js b/cordova-lib/src/cordova/metadata/windows8_parser.js index 074d2a4..b26b22f 100644 --- a/cordova-lib/src/cordova/metadata/windows8_parser.js +++ b/cordova-lib/src/cordova/metadata/windows8_parser.js @@ -20,9 +20,8 @@ var fs = require('fs'), path = require('path'), et = require('elementtree'), util = require('../util'), - events = require('../events'), + events = require('../../events'), shell = require('shelljs'), - events = require('../events'), Q = require('q'), child_process = require('child_process'), ConfigParser = require('../../configparser/ConfigParser'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/metadata/wp8_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/wp8_parser.js b/cordova-lib/src/cordova/metadata/wp8_parser.js index c847fc6..159bd18 100644 --- a/cordova-lib/src/cordova/metadata/wp8_parser.js +++ b/cordova-lib/src/cordova/metadata/wp8_parser.js @@ -20,7 +20,7 @@ var fs = require('fs'), path = require('path'), et = require('elementtree'), util = require('../util'), - events = require('../events'), + events = require('../../events'), shell = require('shelljs'), child_process = require('child_process'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/platform.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js index 8d5d418..38e1bfc 100644 --- a/cordova-lib/src/cordova/platform.js +++ b/cordova-lib/src/cordova/platform.js @@ -28,7 +28,7 @@ var config = require('./config'), os = require('os'), path = require('path'), hooker = require('./hooker'), - events = require('./events'), + events = require('../events'), lazy_load = require('./lazy_load'), CordovaError = require('../CordovaError'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/plugin.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index ae0fc10..8541b21 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -29,7 +29,7 @@ var cordova_util = require('./util'), ConfigParser = require('../configparser/ConfigParser'), fs = require('fs'), PluginInfo = require('../PluginInfo'), - events = require('./events'); + events = require('../events'); // Returns a promise. module.exports = function plugin(command, targets, opts) { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/prepare.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js index 9727e46..fadb39c 100644 --- a/cordova-lib/src/cordova/prepare.js +++ b/cordova-lib/src/cordova/prepare.js @@ -26,7 +26,7 @@ var cordova_util = require('./util'), et = require('elementtree'), hooker = require('./hooker'), lazy_load = require('./lazy_load'), - events = require('./events'), + events = require('../events'), Q = require('q'), plugman = require('../plugman/plugman'), util = require('util'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/restore.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/restore.js b/cordova-lib/src/cordova/restore.js index 196967a..0d56b4a 100644 --- a/cordova-lib/src/cordova/restore.js +++ b/cordova-lib/src/cordova/restore.js @@ -24,7 +24,7 @@ var cordova_util = require('./util'), Q = require('q'), fs = require('fs'), plugin = require('./plugin'), - events = require('./events'); + events = require('../events'); module.exports = function restore(target){ var projectHome = cordova_util.cdProjectRoot(); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/save.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/save.js b/cordova-lib/src/cordova/save.js index 4cdcac8..8165058 100644 --- a/cordova-lib/src/cordova/save.js +++ b/cordova-lib/src/cordova/save.js @@ -22,7 +22,7 @@ var cordova_util = require('./util'), path = require('path'), xml = require('../util/xml-helpers') Q = require('q'), - events = require('./events'); + events = require('../events'); module.exports = function save(target, opts){ opts = opts || {}; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/cordova/superspawn.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/superspawn.js b/cordova-lib/src/cordova/superspawn.js index 60c9fdc..3b14e4b 100644 --- a/cordova-lib/src/cordova/superspawn.js +++ b/cordova-lib/src/cordova/superspawn.js @@ -23,7 +23,7 @@ var path = require('path'); var _ = require('underscore'); var Q = require('q'); var shell = require('shelljs'); -var events = require('./events'); +var events = require('../events'); var iswin32 = process.platform == 'win32'; // On Windows, spawn() for batch files requires absolute path & having the extension. http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/events.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/events.js b/cordova-lib/src/events.js new file mode 100644 index 0000000..8c9272d --- /dev/null +++ b/cordova-lib/src/events.js @@ -0,0 +1,19 @@ +/** + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +*/ +module.exports = new (require('events').EventEmitter)(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/events.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/events.js b/cordova-lib/src/plugman/events.js deleted file mode 100644 index 361513b..0000000 --- a/cordova-lib/src/plugman/events.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. -*/ - -module.exports = new (require('events').EventEmitter)(); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/fetch.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/fetch.js b/cordova-lib/src/plugman/fetch.js index b6423cb..a3d095c 100644 --- a/cordova-lib/src/plugman/fetch.js +++ b/cordova-lib/src/plugman/fetch.js @@ -22,7 +22,7 @@ var shell = require('shelljs'), plugins = require('./util/plugins'), xml_helpers = require('../util/xml-helpers'), CordovaError = require('../CordovaError'), - events = require('./events'), + events = require('../events'), metadata = require('./util/metadata'), path = require('path'), Q = require('q'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/install.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js index 3078b36..4ad77f4 100644 --- a/cordova-lib/src/plugman/install.js +++ b/cordova-lib/src/plugman/install.js @@ -33,7 +33,7 @@ var path = require('path'), os = require('os'), underscore = require('underscore'), shell = require('shelljs'), - events = require('./events'), + events = require('../events'), plugman = require('./plugman'), isWindows = (os.platform().substr(0,3) === 'win'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/amazon-fireos.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/amazon-fireos.js b/cordova-lib/src/plugman/platforms/amazon-fireos.js index 444759b..a834b87 100644 --- a/cordova-lib/src/plugman/platforms/amazon-fireos.js +++ b/cordova-lib/src/plugman/platforms/amazon-fireos.js @@ -20,7 +20,7 @@ var fs = require('fs') // use existsSync in 0.6.x , path = require('path') , common = require('./common') - , events = require('../events') + , events = require('../../events') , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers')); module.exports = { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/android.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/android.js b/cordova-lib/src/plugman/platforms/android.js index 47669ae..20dd55e 100644 --- a/cordova-lib/src/plugman/platforms/android.js +++ b/cordova-lib/src/plugman/platforms/android.js @@ -20,7 +20,7 @@ var fs = require('fs') // use existsSync in 0.6.x , path = require('path') , common = require('./common') - , events = require('../events') + , events = require('../../events') , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers')) , properties_parser = require('properties-parser') , android_project = require('../util/android-project'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/blackberry10.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/blackberry10.js b/cordova-lib/src/plugman/platforms/blackberry10.js index b8a8488..a34e795 100644 --- a/cordova-lib/src/plugman/platforms/blackberry10.js +++ b/cordova-lib/src/plugman/platforms/blackberry10.js @@ -20,7 +20,7 @@ var fs = require('fs') // use existsSync in 0.6.x , path = require('path') , common = require('./common') - , events = require('../events') + , events = require('../../events') , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers')); var TARGETS = ["device", "simulator"]; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/firefoxos.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/firefoxos.js b/cordova-lib/src/plugman/platforms/firefoxos.js index 967582c..feb543f 100644 --- a/cordova-lib/src/plugman/platforms/firefoxos.js +++ b/cordova-lib/src/plugman/platforms/firefoxos.js @@ -19,7 +19,7 @@ var path = require('path') , fs = require('fs') , common = require('./common') - , events = require('../events') + , events = require('../../events') , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers')); module.exports = { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/ios.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/ios.js b/cordova-lib/src/plugman/platforms/ios.js index 1c5d8ea..fec8f3f 100644 --- a/cordova-lib/src/plugman/platforms/ios.js +++ b/cordova-lib/src/plugman/platforms/ios.js @@ -23,7 +23,7 @@ var path = require('path') , xcode = require('xcode') , plist = require('plist-with-patches') , shell = require('shelljs') - , events = require('../events') + , events = require('../../events') , cachedProjectFiles = {}; module.exports = { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/tizen.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/tizen.js b/cordova-lib/src/plugman/platforms/tizen.js index 967582c..feb543f 100644 --- a/cordova-lib/src/plugman/platforms/tizen.js +++ b/cordova-lib/src/plugman/platforms/tizen.js @@ -19,7 +19,7 @@ var path = require('path') , fs = require('fs') , common = require('./common') - , events = require('../events') + , events = require('../../events') , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers')); module.exports = { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/ubuntu.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/ubuntu.js b/cordova-lib/src/plugman/platforms/ubuntu.js index 33fea3b..31c6e1e 100644 --- a/cordova-lib/src/plugman/platforms/ubuntu.js +++ b/cordova-lib/src/plugman/platforms/ubuntu.js @@ -29,7 +29,7 @@ function toCamelCase(str) { var fs = require('fs') , path = require('path') - , events = require('../events') + , events = require('../../events') , xml_helpers = require(path.join(__dirname, '..', '..', 'util', 'xml-helpers')); module.exports = { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/windows8.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/windows8.js b/cordova-lib/src/plugman/platforms/windows8.js index ed6edaa..571ca64 100644 --- a/cordova-lib/src/plugman/platforms/windows8.js +++ b/cordova-lib/src/plugman/platforms/windows8.js @@ -23,7 +23,7 @@ var common = require('./common'), shell = require('shelljs'), fs = require('fs'), w8jsproj = require('../util/w8jsproj'), - events = require('../events'), + events = require('../../events'), xml_helpers = require('../../util/xml-helpers'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/platforms/wp8.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/platforms/wp8.js b/cordova-lib/src/plugman/platforms/wp8.js index 5af840f..fa14441 100644 --- a/cordova-lib/src/plugman/platforms/wp8.js +++ b/cordova-lib/src/plugman/platforms/wp8.js @@ -22,7 +22,7 @@ var common = require('./common'), glob = require('glob'), fs = require('fs'), csproj = require('../util/csproj'), - events = require('../events'), + events = require('../../events'), xml_helpers = require('../../util/xml-helpers'); module.exports = { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/plugman.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js index 0c0a629..73d83cf 100644 --- a/cordova-lib/src/plugman/plugman.js +++ b/cordova-lib/src/plugman/plugman.js @@ -19,7 +19,7 @@ // copyright (c) 2013 Andrew Lunny, Adobe Systems -var events = require('./events'); +var events = require('../events'); var Q = require('q'); function addProperty(o, symbol, modulePath, doWrap) { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/prepare-browserify.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/prepare-browserify.js b/cordova-lib/src/plugman/prepare-browserify.js index d5c003d..00e6128 100644 --- a/cordova-lib/src/plugman/prepare-browserify.js +++ b/cordova-lib/src/plugman/prepare-browserify.js @@ -29,7 +29,7 @@ var platform_modules = require('./platforms'), fs = require('fs'), shell = require('shelljs'), util = require('util'), - events = require('./events'), + events = require('../events'), plugman = require('./plugman'), et = require('elementtree'), prepareNamespace = require('./util/prepare-namespace'), http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/prepare.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/prepare.js b/cordova-lib/src/plugman/prepare.js index c291b1f..74d590c 100644 --- a/cordova-lib/src/plugman/prepare.js +++ b/cordova-lib/src/plugman/prepare.js @@ -29,7 +29,7 @@ var platform_modules = require('./platforms'), fs = require('fs'), shell = require('shelljs'), util = require('util'), - events = require('./events'), + events = require('../events'), plugman = require('./plugman'), et = require('elementtree'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/uninstall.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/uninstall.js b/cordova-lib/src/plugman/uninstall.js index ec66252..5cb9e28 100644 --- a/cordova-lib/src/plugman/uninstall.js +++ b/cordova-lib/src/plugman/uninstall.js @@ -30,7 +30,7 @@ var path = require('path'), Q = require('q'), plugins = require('./util/plugins'), underscore = require('underscore'), - events = require('./events'), + events = require('../events'), platform_modules = require('./platforms'), plugman = require('./plugman'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/util/action-stack.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/util/action-stack.js b/cordova-lib/src/plugman/util/action-stack.js index 8054f0a..0df86dc 100644 --- a/cordova-lib/src/plugman/util/action-stack.js +++ b/cordova-lib/src/plugman/util/action-stack.js @@ -17,7 +17,7 @@ under the License. */ var platforms = require("../platforms"), - events = require('../events'), + events = require('../../events'), Q = require('q'), fs = require('fs'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/util/config-changes.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/util/config-changes.js b/cordova-lib/src/plugman/util/config-changes.js index 8e3b614..55aa384 100644 --- a/cordova-lib/src/plugman/util/config-changes.js +++ b/cordova-lib/src/plugman/util/config-changes.js @@ -41,7 +41,7 @@ var fs = require('fs'), _ = require('underscore'), xml_helpers = require('../../util/xml-helpers'), platforms = require('./../platforms'), - events = require('./../events'), + events = require('../../events'), plist_helpers = require('./../util/plist-helpers'); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/util/plugins.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/util/plugins.js b/cordova-lib/src/plugman/util/plugins.js index f140486..471d8b0 100644 --- a/cordova-lib/src/plugman/util/plugins.js +++ b/cordova-lib/src/plugman/util/plugins.js @@ -26,7 +26,7 @@ var http = require('http'), child_process = require('child_process'), Q = require('q'), xml_helpers = require('../../util/xml-helpers'), - events = require('../events'), + events = require('../../events'), tmp_dir; module.exports = { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6f7a67a7/cordova-lib/src/plugman/util/w8jsproj.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/util/w8jsproj.js b/cordova-lib/src/plugman/util/w8jsproj.js index 47680fe..6958de0 100644 --- a/cordova-lib/src/plugman/util/w8jsproj.js +++ b/cordova-lib/src/plugman/util/w8jsproj.js @@ -25,7 +25,7 @@ var xml_helpers = require('../../util/xml-helpers'), et = require('elementtree'), fs = require('fs'), shell = require('shelljs'), - events = require('../events'), + events = require('../../events'), path = require('path'); var WindowsStoreProjectTypeGUID = "{BC8A1FFA-BEE3-4634-8014-F334798102B3}"; // any of the below, subtype
