fixed merge issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/06273088 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/06273088 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/06273088 Branch: refs/heads/ffos Commit: 06273088134dcad7058e7382c3482f904d38ac63 Parents: d6603c9 0bc7da8 Author: Steven Gill <[email protected]> Authored: Wed Sep 11 16:30:31 2013 -0700 Committer: Steven Gill <[email protected]> Committed: Wed Sep 11 16:30:31 2013 -0700 ---------------------------------------------------------------------- lib/firefoxos/exec.js | 32 +++++++++++++++++++++++++++++--- lib/firefoxos/platform.js | 13 +++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/06273088/lib/firefoxos/exec.js ---------------------------------------------------------------------- diff --cc lib/firefoxos/exec.js index ab3311b,d9d958a..a41d5df --- a/lib/firefoxos/exec.js +++ b/lib/firefoxos/exec.js @@@ -1,3 -1,8 +1,29 @@@ - module.exports = function() { - console.log('exec not implemented yet'); - } ++/* ++ * ++ * 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 firefoxos = require('cordova/platform'); + + module.exports = function(success, fail, service, action, actionArgs) { + var plugin = firefoxos.getPlugin(service); + actionArgs.unshift(fail); + actionArgs.unshift(success); + plugin[action].apply(plugin, actionArgs); + };
