Skip to content

fixed grunt minification and dependency injection bug #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tahashahid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed grunt minification and dependency injection bug #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 57 additions & 60 deletions dist/angular-audio-recorder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ var blobToDataURL = function (blob, callback) {
};
a.readAsDataURL(blob);
};

var RecorderController = function (element, service, recorderUtils, $scope, $timeout, $interval, PLAYBACK) {
var RecorderController = function ($element, recorderService, recorderUtils, $scope, $timeout, $interval, recorderPlaybackStatus) {
//used in NON-Angular Async process
var scopeApply = function (fn) {
var phase = $scope.$root.$$phase;
Expand All @@ -79,73 +78,73 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
audioObjId = 'recorded-audio-' + control.id,
status = {
isRecording: false,
playback: PLAYBACK.STOPPED,
playback: recorderPlaybackStatus.STOPPED,
isDenied: null,
isSwfLoaded: null,
isConverting: false,
get isPlaying() {
return status.playback === PLAYBACK.PLAYING;
return status.playback === recorderPlaybackStatus.PLAYING;
},
get isStopped() {
return status.playback === PLAYBACK.STOPPED;
return status.playback === recorderPlaybackStatus.STOPPED;
},
get isPaused() {
return status.playback === PLAYBACK.PAUSED;
return status.playback === recorderPlaybackStatus.PAUSED;
}
},
shouldConvertToMp3 = angular.isDefined(control.convertMp3) ? !!control.convertMp3 : service.shouldConvertToMp3(),
mp3Converter = shouldConvertToMp3 ? new MP3Converter(service.getMp3Config()) : null;
shouldConvertToMp3 = angular.isDefined(control.convertMp3) ? !!control.convertMp3 : recorderService.shouldConvertToMp3(),
mp3Converter = shouldConvertToMp3 ? new MP3Converter(recorderService.getMp3Config()) : null;
;


control.timeLimit = control.timeLimit || 0;
control.status = createReadOnlyVersion(status);
control.isAvailable = service.isAvailable();
control.isAvailable = recorderService.isAvailable();
control.elapsedTime = 0;
//Sets ID for the element if ID doesn't exists
//Sets ID for the $element if ID doesn't exists
if (!control.id) {
control.id = recorderUtils.generateUuid();
element.attr("id", control.id);
$element.attr("id", control.id);
}


if (!service.isHtml5 && !service.isCordova) {
status.isSwfLoaded = service.swfIsLoaded();
if (!recorderService.isHtml5 && !recorderService.isCordova) {
status.isSwfLoaded = recorderService.swfIsLoaded();
$scope.$watch(function () {
return service.swfIsLoaded();
return recorderService.swfIsLoaded();
}, function (n) {
status.isSwfLoaded = n;
});
}


//register controller with service
service.setController(control.id, this);
//register controller with recorderService
recorderService.setController(control.id, this);

var playbackOnEnded = function () {
status.playback = PLAYBACK.STOPPED;
status.playback = recorderPlaybackStatus.STOPPED;
control.onPlaybackComplete();
scopeApply();
};

var playbackOnPause = function () {
status.playback = PLAYBACK.PAUSED;
status.playback = recorderPlaybackStatus.PAUSED;
control.onPlaybackPause();
};

var playbackOnStart = function () {
status.playback = PLAYBACK.PLAYING;
status.playback = recorderPlaybackStatus.PLAYING;
control.onPlaybackStart();
};

var playbackOnResume = function () {
status.playback = PLAYBACK.PLAYING;
status.playback = recorderPlaybackStatus.PLAYING;
control.onPlaybackResume();
};

var embedPlayer = function (blob) {
if (document.getElementById(audioObjId) == null) {
element.append('<audio type="audio/mp3" id="' + audioObjId + '"></audio>');
$element.append('<audio type="audio/mp3" id="' + audioObjId + '"></audio>');

var audioPlayer = document.getElementById(audioObjId);
if (control.showPlayer) {
Expand Down Expand Up @@ -199,28 +198,28 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
};

control.getAudioPlayer = function () {
return service.isCordova ? cordovaMedia.player : document.getElementById(audioObjId);
return recorderService.isCordova ? cordovaMedia.player : document.getElementById(audioObjId);
};


control.startRecord = function () {
if (!service.isAvailable()) {
if (!recorderService.isAvailable()) {
return;
}

if (status.isPlaying) {
control.playbackPause();
//indicate that this is not paused.
status.playback = PLAYBACK.STOPPED;
status.playback = recorderPlaybackStatus.STOPPED;
}

//clear audio previously recorded
control.audioModel = null;

var id = control.id, recordHandler = service.getHandler();
var id = control.id, recordHandler = recorderService.getHandler();
//Record initiation based on browser type
var start = function () {
if (service.isCordova) {
if (recorderService.isCordova) {
cordovaMedia.url = recorderUtils.cordovaAudioUrl(control.id);
//mobile app needs wav extension to save recording
cordovaMedia.recorder = new Media(cordovaMedia.url, function () {
Expand All @@ -231,7 +230,7 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
console.log('CordovaRecording');
cordovaMedia.recorder.startRecord();
}
else if (service.isHtml5) {
else if (recorderService.isHtml5) {
//HTML5 recording
if (!recordHandler) {
return;
Expand All @@ -242,7 +241,7 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
}
else {
//Flash recording
if (!service.isReady) {
if (!recorderService.isReady) {
//Stop recording if the flash object is not ready
return;
}
Expand All @@ -261,18 +260,18 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
}, 1000);
};

if (service.isCordova || recordHandler) {
if (recorderService.isCordova || recordHandler) {
start();
} else if (!status.isDenied) {
//probably permission was never asked
service.showPermission({
recorderService.showPermission({
onDenied: function () {
status.isDenied = true;
$scope.$apply();
},
onAllowed: function () {
status.isDenied = false;
recordHandler = service.getHandler();
recordHandler = recorderService.getHandler();
start();
scopeApply();
}
Expand All @@ -282,11 +281,11 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim

control.stopRecord = function () {
var id = control.id;
if (!service.isAvailable() || !status.isRecording) {
if (!recorderService.isAvailable() || !status.isRecording) {
return false;
}

var recordHandler = service.getHandler();
var recordHandler = recorderService.getHandler();
var completed = function (blob) {
$interval.cancel(timing);
status.isRecording = false;
Expand All @@ -306,7 +305,7 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
};

//To stop recording
if (service.isCordova) {
if (recorderService.isCordova) {
cordovaMedia.recorder.stopRecord();
window.resolveLocalFileSystemURL(cordovaMedia.url, function (entry) {
entry.file(function (blob) {
Expand All @@ -315,7 +314,7 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
}, function (err) {
console.log('Could not retrieve file, error code:', err.code);
});
} else if (service.isHtml5) {
} else if (recorderService.isHtml5) {
recordHandler.stop();
recordHandler.getBuffer(function () {
recordHandler.exportWAV(function (blob) {
Expand All @@ -330,11 +329,11 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
};

control.playbackRecording = function () {
if (status.isPlaying || !service.isAvailable() || status.isRecording || !control.audioModel) {
if (status.isPlaying || !recorderService.isAvailable() || status.isRecording || !control.audioModel) {
return false;
}

if (service.isCordova) {
if (recorderService.isCordova) {
cordovaMedia.player = new Media(cordovaMedia.url, playbackOnEnded, function () {
console.log('Playback failed');
});
Expand All @@ -347,25 +346,25 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
};

control.playbackPause = function () {
if (!status.isPlaying || !service.isAvailable() || status.isRecording || !control.audioModel) {
if (!status.isPlaying || !recorderService.isAvailable() || status.isRecording || !control.audioModel) {
return false;
}

control.getAudioPlayer().pause();
if (service.isCordova) {
if (recorderService.isCordova) {
playbackOnPause();
}
};

control.playbackResume = function () {
if (status.isPlaying || !service.isAvailable() || status.isRecording || !control.audioModel) {
if (status.isPlaying || !recorderService.isAvailable() || status.isRecording || !control.audioModel) {
return false;
}

if (status.isPaused) {
//previously paused, just resume
control.getAudioPlayer().play();
if (service.isCordova) {
if (recorderService.isCordova) {
playbackOnResume();
}
} else {
Expand All @@ -376,7 +375,7 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim


control.save = function (fileName) {
if (!service.isAvailable() || status.isRecording || !control.audioModel) {
if (!recorderService.isAvailable() || status.isRecording || !control.audioModel) {
return false;
}

Expand All @@ -395,7 +394,7 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
};

control.isHtml5 = function () {
return service.isHtml5;
return recorderService.isHtml5;
};

if (control.autoStart) {
Expand All @@ -404,16 +403,14 @@ var RecorderController = function (element, service, recorderUtils, $scope, $tim
}, 1000);
}

element.on('$destroy', function () {
$element.on('$destroy', function () {
$interval.cancel(timing);
});

};

RecorderController.$inject = ['$element', 'recorderService', 'recorderUtils', '$scope', '$timeout', '$interval', 'recorderPlaybackStatus'];

angular.module('angularAudioRecorder.controllers')
.controller('recorderController', RecorderController)
.controller('recorderController', ['$element', 'recorderService', 'recorderUtils', '$scope', '$timeout', '$interval', 'recorderPlaybackStatus', RecorderController])
;
angular.module('angularAudioRecorder.directives', [
'angularAudioRecorder.config',
Expand All @@ -422,15 +419,15 @@ angular.module('angularAudioRecorder.directives', [
]);
angular.module('angularAudioRecorder.directives')
.directive('ngAudioRecorderAnalyzer', ['recorderService', 'recorderUtils',
function (service, utils) {
function (recorderService, recorderUtils) {

var link = function (scope, element, attrs, recorder) {
if (!service.isHtml5) {
if (!recorderService.isHtml5) {
scope.hide = true;
return;
}

var canvasWidth, canvasHeight, rafID, analyserContext, props = service.$html5AudioProps;
var canvasWidth, canvasHeight, rafID, analyserContext, props = recorderService.$html5AudioProps;

function updateAnalysers(time) {

Expand Down Expand Up @@ -500,8 +497,8 @@ angular.module('angularAudioRecorder.directives')
};
})(recorder.onRecordStart);

utils.appendActionToCallback(recorder, 'onRecordStart', updateAnalysers, 'analyzer');
utils.appendActionToCallback(recorder, 'onRecordComplete', cancelAnalyserUpdates, 'analyzer');
recorderUtils.appendActionToCallback(recorder, 'onRecordStart', updateAnalysers, 'analyzer');
recorderUtils.appendActionToCallback(recorder, 'onRecordComplete', cancelAnalyserUpdates, 'analyzer');
};

return {
Expand All @@ -516,8 +513,8 @@ angular.module('angularAudioRecorder.directives')
}
]);
angular.module('angularAudioRecorder.directives')
.directive('ngAudioRecorderWaveView', ['recorderService', 'recorderUtils', '$log',
function (service, utils, $log) {
.directive('ngAudioRecorderWaveView', ['recorderUtils', '$log',
function (recorderUtils, $log) {

return {
restrict: 'E',
Expand All @@ -533,14 +530,14 @@ angular.module('angularAudioRecorder.directives')
var options = angular.extend({container: $element.find('div')[0]}, attrs);
var waveSurfer = WaveSurfer.create(options);
waveSurfer.setVolume(0);
utils.appendActionToCallback(recorder, 'onPlaybackStart|onPlaybackResume', function () {
recorderUtils.appendActionToCallback(recorder, 'onPlaybackStart|onPlaybackResume', function () {
waveSurfer.play();
}, 'waveView');
utils.appendActionToCallback(recorder, 'onPlaybackComplete|onPlaybackPause', function () {
recorderUtils.appendActionToCallback(recorder, 'onPlaybackComplete|onPlaybackPause', function () {
waveSurfer.pause();
}, 'waveView');

utils.appendActionToCallback(recorder, 'onRecordComplete', function () {
recorderUtils.appendActionToCallback(recorder, 'onRecordComplete', function () {
if (!audioPlayer) {
audioPlayer = recorder.getAudioPlayer();
audioPlayer.addEventListener('seeking', function (e) {
Expand Down Expand Up @@ -614,16 +611,16 @@ angular.module('angularAudioRecorder.directives')
angular.module('angularAudioRecorder.services', ['angularAudioRecorder.config']);
angular.module('angularAudioRecorder.services')
.provider('recorderService', ['recorderScriptUrl',
function (scriptPath) {
function (recorderScriptUrl) {
var handler = null,
service = {isHtml5: false, isReady: false},
permissionHandlers = {onDenied: null, onClosed: null, onAllow: null},
forceSwf = false,
/*this path is relative to the dist path:*/
swfUrl = scriptPath + '../lib/recorder.swf',
swfUrl = recorderScriptUrl + '../lib/recorder.swf',
utils,
mp3Covert = false,
mp3Config = {bitRate: 92, lameJsUrl: scriptPath + '../lib/lame.min.js'}
mp3Config = {bitRate: 92, lameJsUrl: recorderScriptUrl + '../lib/lame.min.js'}
;

var swfHandlerConfig = {
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-audio-recorder.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading