Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 5 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
1 JavaScript/App.js
@@ -495,6 +495,7 @@ API.setLogHandler(function(data) {
data.os_version = (device && device.version) || Browser.version;
data.device = ((device && device.name) || '').toLowerCase();
data.version = Auphonic.Version;
+ if (data.platform == 'iphone' || data.platform == 'ipod touch') data.hardware = (window.screen.height == 568) ? 5 : 4;
return data;
});
View
2 JavaScript/Auphonic.js
@@ -1,4 +1,4 @@
-exports.Version = '1.0.1';
+exports.Version = '1.0.2';
exports.APIURL = 'https://auphonic.com/';
exports.FeedbackURL = 'mailto:mobile@auphonic.com?subject=Auphonic%20Mobile%20App%20Feedback';
exports.RepositoryURL = 'https://github.com/auphonic/auphonic-mobile';
View
4 JavaScript/Capture/CordovaVideoRecorder.js
@@ -33,7 +33,9 @@ module.exports = new Class({
onCaptureError: function(event) {
this.fireEvent('cancel');
- this.fireEvent('error', event);
+ // Don't fire the error event if capturing was canceled
+ if (event.code != window.CaptureError.CAPTURE_NO_MEDIA_FILES)
+ this.fireEvent('error', event);
},
onFileSystemReady: function(fileSystem) {
View
10 JavaScript/View/Object-LoadMore.js
@@ -50,9 +50,17 @@ module.exports = new Class({
if (this.finished) return;
if (this.getView().getCurrentObject() != this) return;
+ var container = this.getItemContainerElement();
+
+ // No container likely means a null state where we don't need to load new content anyway
+ if (!container) {
+ this.finished = true;
+ return;
+ }
+
var options = Object.clone(this.loadOptions);
options.offset += options.limit;
- this.getSpinner().spin(this.getItemContainerElement().getParent());
+ this.getSpinner().spin(container.getParent());
this.getLoadMoreFunction()(options, this.bound('onLoadMore'));
this.loader = loader;
View
1 Scripts/compileForProduction
@@ -8,4 +8,5 @@ source $DIR/compile -e prod -m --no-watch
source $DIR/stylus --no-watch -c
cd $DIR/$AUPHONIC_OUTPUT/
+rm $AUPHONIC_CORDOVA_VERSION.zip
zip -r $AUPHONIC_CORDOVA_VERSION.zip $AUPHONIC_CORDOVA_VERSION/ -x "$AUPHONIC_CORDOVA_VERSION/.*"

No commit comments for this range

Something went wrong with that request. Please try again.