Merge branch 'master' into CB-10085
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/8a7d21d0 Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/8a7d21d0 Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/8a7d21d0 Branch: refs/heads/master Commit: 8a7d21d03255961245169497bb9d087bbdf4db74 Parents: 4f47815 4b1b68e Author: Tobias Bocanegra <[email protected]> Authored: Tue Feb 2 14:03:41 2016 -0800 Committer: Tobias Bocanegra <[email protected]> Committed: Tue Feb 2 14:03:41 2016 -0800 ---------------------------------------------------------------------- CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 8 - CordovaLib/CordovaLib/Classes/CDVBridge.m | 64 +---- CordovaLib/CordovaLib/Classes/Commands/CDV.h | 5 +- .../CordovaLib/Classes/Commands/CDVDevice.h | 29 -- .../CordovaLib/Classes/Commands/CDVDevice.m | 102 ------- tests/CordovaLibTests/CDVBase64Tests.m | 12 +- tests/CordovaLibTests/CDVPluginsTests.m | 56 ++++ tests/CordovaLibTests/CDVStartPageTests.m | 21 +- tests/CordovaLibTests/CDVWebViewTest.h | 2 + tests/CordovaLibTests/CDVWebViewTest.m | 50 ++-- .../CordovaLibTests/CordovaLibApp/AppDelegate.m | 4 +- .../CordovaLibApp/MainViewController.xib | 275 +++++++++++++++---- tests/CordovaLibTests/CordovaLibApp/config.xml | 3 + .../CordovaLibApp/www/cordova_plugins.js | 34 +++ .../CordovaLibApp/www/index.html | 33 +-- .../CordovaLibApp/www/plugins/test-plugin.js | 41 +++ .../CordovaLibTests/CordovaLibApp/www/tests.js | 97 +++++++ .../CordovaLibTests.xcodeproj/project.pbxproj | 12 +- tests/CordovaLibTests/TestPlugin.h | 27 ++ tests/CordovaLibTests/TestPlugin.m | 47 ++++ 20 files changed, 575 insertions(+), 347 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
