Skip to content
This repository has been archived by the owner on May 29, 2020. It is now read-only.

Merging v0.1.0 from dev #1

Merged
merged 9 commits into from
May 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
602 changes: 472 additions & 130 deletions README.md

Large diffs are not rendered by default.

359 changes: 169 additions & 190 deletions dist/ionicitude.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ionicitude.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ var end = '})();';

var files = [
'./src/setup.module.js',
'./src/settings.service.js',
'./src/plugin.service.js',
'./src/lib.service.js',
'./src/ionicitude.service.js'
];

var prodFolder = './dist';
var devFolder = 'C:/Projets/BioSentiers/www/lib/ionicitude/dist';

/**
* Builds a dist version of the module.
* This task does the following :
Expand Down Expand Up @@ -54,9 +54,9 @@ function compileTo(dest) {
}

gulp.task('default', function () {
return compileTo('./dist');
return compileTo(prodFolder);
});

gulp.task('dev', function () {
return compileTo('C:/Projets/BioSentiers/www/lib/ionicitude/dist');
return compileTo(devFolder);
});
4 changes: 2 additions & 2 deletions src/UnsupportedFeatureError.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Defines the UnsupportedFeatureError classe.
* This type of error is and should be used whenever the app tries to start an ARchitect World that request features not supported by the device running the app.
* The requested features (reqFeatures) is a setting accessible in the wikitude.settings.js file.
* Your app's required Features can be defined in the Ionicitude.init() method.
* @constructor
*/
function UnsupportedFeatureError() {
Expand All @@ -12,7 +12,7 @@ function UnsupportedFeatureError() {
if (temp.message) {
this.message = temp.message;
} else {
this.message = "Worls loading error : Your device does not support one or several of it's requested features."
this.message = "AR World loading error : Your device does not support one or several of it's requested features."
}
}

Expand Down
Loading