You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/04/23 20:56:51 UTC
[1/8] git commit: CB-5980 Incremented plugin version on dev branch.
Repository: cordova-plugin-dialogs
Updated Branches:
refs/heads/master c63dd43bb -> fa7f9adad
CB-5980 Incremented plugin version on dev branch.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/a85e6678
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/a85e6678
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/a85e6678
Branch: refs/heads/master
Commit: a85e667838f63f352afc0fcd27907c5167c310b8
Parents: c63dd43
Author: Steven Gill <st...@gmail.com>
Authored: Wed Feb 5 18:13:30 2014 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Feb 5 18:13:30 2014 -0800
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/a85e6678/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 146e405..dd1831f 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="org.apache.cordova.dialogs"
- version="0.2.6">
+ version="0.2.7-dev">
<name>Notification</name>
<description>Cordova Notification Plugin</description>
[4/8] git commit: CB-6411 [BlackBerry10] Updates to beep
Posted by ia...@apache.org.
CB-6411 [BlackBerry10] Updates to beep
- Update to embedded wav file to prevent long fade out
- Fix issues when quantity is not a number
- Fix issues when beep called while previous beep still playing
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/47751e8b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/47751e8b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/47751e8b
Branch: refs/heads/master
Commit: 47751e8b04230a21f53a4f494c232c270342fcd5
Parents: 9c7d444
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Mon Apr 7 13:20:02 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Mon Apr 7 13:23:35 2014 -0400
----------------------------------------------------------------------
plugin.xml | 1 +
www/blackberry10/beep.js | 29 +++++++++++++---------------
www/blackberry10/notification-beep.wav | Bin 0 -> 16630 bytes
3 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/47751e8b/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index dd1831f..4a25f02 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -98,6 +98,7 @@
<js-module src="www/blackberry10/beep.js" name="beep">
<clobbers target="window.navigator.notification.beep" />
</js-module>
+ <source-file src="www/blackberry10/notification-beep.wav" />
</platform>
<!-- wp7 -->
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/47751e8b/www/blackberry10/beep.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/beep.js b/www/blackberry10/beep.js
index 6d4a77a..1b1dedc 100644
--- a/www/blackberry10/beep.js
+++ b/www/blackberry10/beep.js
@@ -18,25 +18,22 @@
* under the License.
*
*/
-var beep,
- count = 0,
- beepObj = new Audio('file:///usr/share/sounds/notification_text_message_im_received.wav');
-beep = function (quantity) {
- var callback = function () {
- if (--count > 0) {
- beepObj.play();
- } else {
- beepObj.removeEventListener("ended", callback);
- delete beepObj;
- }
- };
+module.exports = function (quantity) {
+ var count = 0,
+ beepObj = new Audio('local:///chrome/plugin/org.apache.cordova.dialogs/notification-beep.wav'),
+ callback = function () {
+ if (--count > 0) {
+ beepObj.play();
+ } else {
+ beepObj.removeEventListener("ended", callback);
+ delete beepObj;
+ }
+ };
- count += quantity;
- if (count === quantity) {
+ count += quantity || 1;
+ if (count > 0) {
beepObj.addEventListener("ended", callback);
beepObj.play();
}
};
-
-module.exports = beep;
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/47751e8b/www/blackberry10/notification-beep.wav
----------------------------------------------------------------------
diff --git a/www/blackberry10/notification-beep.wav b/www/blackberry10/notification-beep.wav
new file mode 100644
index 0000000..d0ad085
Binary files /dev/null and b/www/blackberry10/notification-beep.wav differ
[5/8] git commit: CB-6411 [BlackBerry10] Work around Audio playback
issue
Posted by ia...@apache.org.
CB-6411 [BlackBerry10] Work around Audio playback issue
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/1e7a1229
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/1e7a1229
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/1e7a1229
Branch: refs/heads/master
Commit: 1e7a122937b23eb19167a92b0c8c7a0fb6cd2a33
Parents: 47751e8
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Tue Apr 8 11:17:55 2014 -0400
Committer: Bryan Higgins <bh...@blackberry.com>
Committed: Tue Apr 8 11:17:55 2014 -0400
----------------------------------------------------------------------
www/blackberry10/beep.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/1e7a1229/www/blackberry10/beep.js
----------------------------------------------------------------------
diff --git a/www/blackberry10/beep.js b/www/blackberry10/beep.js
index 1b1dedc..6605107 100644
--- a/www/blackberry10/beep.js
+++ b/www/blackberry10/beep.js
@@ -21,19 +21,22 @@
module.exports = function (quantity) {
var count = 0,
- beepObj = new Audio('local:///chrome/plugin/org.apache.cordova.dialogs/notification-beep.wav'),
+ beepObj,
+ play = function () {
+ //create new object every time due to strage playback behaviour
+ beepObj = new Audio('local:///chrome/plugin/org.apache.cordova.dialogs/notification-beep.wav');
+ beepObj.addEventListener("ended", callback);
+ beepObj.play();
+ },
callback = function () {
if (--count > 0) {
- beepObj.play();
+ play();
} else {
- beepObj.removeEventListener("ended", callback);
delete beepObj;
}
};
-
count += quantity || 1;
if (count > 0) {
- beepObj.addEventListener("ended", callback);
- beepObj.play();
+ play();
}
};
[7/8] git commit: CB-6460: Update license headers
Posted by ia...@apache.org.
CB-6460: Update license headers
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/913c7591
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/913c7591
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/913c7591
Branch: refs/heads/master
Commit: 913c759118af5187ec6338374014da822c3e52ac
Parents: 3deda90
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Apr 16 16:17:11 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed Apr 16 16:17:11 2014 -0400
----------------------------------------------------------------------
plugin.xml | 18 ++++++++++++++++++
src/firefoxos/notification.js | 21 +++++++++++++++++++++
src/ubuntu/notification.qml | 21 +++++++++++++++++++++
www/firefoxos/notification.css | 21 +++++++++++++++++++++
4 files changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/913c7591/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 4a25f02..a005a61 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="org.apache.cordova.dialogs"
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/913c7591/src/firefoxos/notification.js
----------------------------------------------------------------------
diff --git a/src/firefoxos/notification.js b/src/firefoxos/notification.js
index 5c14829..ca7c5c0 100644
--- a/src/firefoxos/notification.js
+++ b/src/firefoxos/notification.js
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+*/
+
function _empty() {}
function modal(message, callback, title, buttonLabels, domObjects) {
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/913c7591/src/ubuntu/notification.qml
----------------------------------------------------------------------
diff --git a/src/ubuntu/notification.qml b/src/ubuntu/notification.qml
index dc42b4b..8fd4885 100644
--- a/src/ubuntu/notification.qml
+++ b/src/ubuntu/notification.qml
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+*/
+
import QtQuick 2.0
import Ubuntu.Components.Popups 0.1
import Ubuntu.Components 0.1
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/913c7591/www/firefoxos/notification.css
----------------------------------------------------------------------
diff --git a/www/firefoxos/notification.css b/www/firefoxos/notification.css
index af940de..34d92b8 100644
--- a/www/firefoxos/notification.css
+++ b/www/firefoxos/notification.css
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+*/
+
/* Main dialog setup */
form[role="dialog"] {
background:
[8/8] git commit: CB-6452 Updated version and RELEASENOTES.md for
release 0.2.7
Posted by ia...@apache.org.
CB-6452 Updated version and RELEASENOTES.md for release 0.2.7
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/fa7f9ada
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/fa7f9ada
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/fa7f9ada
Branch: refs/heads/master
Commit: fa7f9adad78b81407ebc64e4371729b06cb22080
Parents: 913c759
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Apr 17 10:53:20 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Apr 17 10:53:20 2014 -0400
----------------------------------------------------------------------
RELEASENOTES.md | 8 ++++++++
plugin.xml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/fa7f9ada/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f0b6db2..aed8d0b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -57,3 +57,11 @@
### 0.2.6 (Feb 05, 2014)
* no need to recreate the manifest.webapp file after each `cordova prepare` for FFOS
* FFOS description added
+
+### 0.2.7 (Apr 17, 2014)
+* CB-6212: [iOS] fix warnings compiled under arm64 64-bit
+* CB-6411: [BlackBerry10] Work around Audio playback issue
+* CB-6411: [BlackBerry10] Updates to beep
+* CB-6422: [windows8] use cordova/exec/proxy
+* CB-6460: Update license headers
+* Add NOTICE file
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/fa7f9ada/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index a005a61..a741997 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -20,7 +20,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
id="org.apache.cordova.dialogs"
- version="0.2.7-dev">
+ version="0.2.7">
<name>Notification</name>
<description>Cordova Notification Plugin</description>
[6/8] git commit: CB-6422 [windows8] use cordova/exec/proxy
Posted by ia...@apache.org.
CB-6422 [windows8] use cordova/exec/proxy
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/3deda901
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/3deda901
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/3deda901
Branch: refs/heads/master
Commit: 3deda9014c4d20aa3b4e83fea1abf17c32e5a6d6
Parents: 1e7a122
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Apr 8 16:14:20 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Apr 8 16:14:20 2014 -0700
----------------------------------------------------------------------
src/windows8/NotificationProxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/3deda901/src/windows8/NotificationProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/NotificationProxy.js b/src/windows8/NotificationProxy.js
index aed72a5..d61adae 100644
--- a/src/windows8/NotificationProxy.js
+++ b/src/windows8/NotificationProxy.js
@@ -117,4 +117,4 @@ module.exports = {
}
};
-require("cordova/windows8/commandProxy").add("Notification",module.exports);
+require("cordova/exec/proxy").add("Notification",module.exports);
[3/8] git commit: CB-6212 iOS: fix warnings compiled under arm64
64-bit
Posted by ia...@apache.org.
CB-6212 iOS: fix warnings compiled under arm64 64-bit
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/9c7d4442
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/9c7d4442
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/9c7d4442
Branch: refs/heads/master
Commit: 9c7d4442f4f74cba573cff8a65deeb4437f21840
Parents: 18caa06
Author: James Jong <wj...@gmail.com>
Authored: Thu Mar 13 09:56:58 2014 -0400
Committer: James Jong <wj...@gmail.com>
Committed: Thu Mar 13 09:56:58 2014 -0400
----------------------------------------------------------------------
src/ios/CDVNotification.m | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/9c7d4442/src/ios/CDVNotification.m
----------------------------------------------------------------------
diff --git a/src/ios/CDVNotification.m b/src/ios/CDVNotification.m
index 58c04f0..ac95cc6 100644
--- a/src/ios/CDVNotification.m
+++ b/src/ios/CDVNotification.m
@@ -49,7 +49,7 @@ static void soundCompletionCallback(SystemSoundID ssid, void* data);
alertView.callbackId = callbackId;
- int count = [buttons count];
+ NSUInteger count = [buttons count];
for (int n = 0; n < count; n++) {
[alertView addButtonWithTitle:[buttons objectAtIndex:n]];
@@ -106,7 +106,7 @@ static void soundCompletionCallback(SystemSoundID ssid, void* data);
// Determine what gets returned to JS based on the alert view type.
if (alertView.alertViewStyle == UIAlertViewStyleDefault) {
// For alert and confirm, return button index as int back to JS.
- result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:buttonIndex + 1];
+ result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:(int)(buttonIndex + 1)];
} else {
// For prompt, return button index and input text back to JS.
NSString* value0 = [[alertView textFieldAtIndex:0] text];
@@ -121,13 +121,14 @@ static void soundCompletionCallback(SystemSoundID ssid, void* data);
static void playBeep(int count) {
SystemSoundID completeSound;
+ NSInteger cbDataCount = count;
NSURL* audioPath = [[NSBundle mainBundle] URLForResource:@"CDVNotification.bundle/beep" withExtension:@"wav"];
#if __has_feature(objc_arc)
AudioServicesCreateSystemSoundID((__bridge CFURLRef)audioPath, &completeSound);
#else
AudioServicesCreateSystemSoundID((CFURLRef)audioPath, &completeSound);
#endif
- AudioServicesAddSystemSoundCompletion(completeSound, NULL, NULL, soundCompletionCallback, (void*)(count-1));
+ AudioServicesAddSystemSoundCompletion(completeSound, NULL, NULL, soundCompletionCallback, (void*)(cbDataCount-1));
AudioServicesPlaySystemSound(completeSound);
}
[2/8] git commit: Add NOTICE file
Posted by ia...@apache.org.
Add NOTICE file
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/commit/18caa06f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/tree/18caa06f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/diff/18caa06f
Branch: refs/heads/master
Commit: 18caa06fd520c2803c5f766622123b2e68b3c83d
Parents: a85e667
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 27 15:36:31 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 27 15:36:31 2014 -0500
----------------------------------------------------------------------
NOTICE | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-dialogs/blob/18caa06f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..8ec56a5
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache Cordova
+Copyright 2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).