Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:getcanoe/canoe into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Rami Taibah committed Feb 26, 2018
2 parents b35037f + df5214a commit 95086c2
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/js/services/soundService.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ angular.module('canoeApp.services').factory('soundService', function ($log, plat
var bling = makeMedia('sounds/bling1.mp3')

function makeMedia (path) {
/* if (isCordova) {
// Play the audio file at url
if (isCordova) {
return null
/* // Play the audio file at url
return Media(path,
// success callback
function () {
Expand All @@ -19,13 +20,16 @@ angular.module('canoeApp.services').factory('soundService', function ($log, plat
function (err) {
$log.debug('playAudio():Audio Error: ' + err)
})
} else {*/
*/
} else {
return new Audio(path)
/*} */
}
}

root.playBling = function () {
bling.play()
if (bling) {
bling.play()
}
}

return root
Expand Down

0 comments on commit 95086c2

Please sign in to comment.