javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor($ionicLoading): cleanup deprecations

Browse Source
This commit is contained in:
Andy Joslin
2014-04-09 06:59:58 -06:00
parent d36a6f3ba9
commit 3b2e2c9f5e
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/ext/angular/src/service/ionicLoading.js vendored
View File

@@ -6,9 +6,6 @@ var TPL_LOADING =
var HIDE_LOADING_DEPRECATED = '$ionicLoading instance.hide() has been deprecated. Use $ionicLoading.hide().';
var SHOW_LOADING_DEPRECATED = '$ionicLoading instance.show() has been deprecated. Use $ionicLoading.show().';
var SET_LOADING_DEPRECATED = '$ionicLoading instance.setContent() has been deprecated. Use $ionicLoading.show({ template: \'my content\' }).';
var CONTENT_LOADING_DEPRECATED = '$ionicLoading options.content has been deprecated. Use options.template or options.templateUrl instead.';
var SHOW_DELAY_LOADING_DEPRECATED = '$ionicLoading options.showDelay has been deprecated. Use options.delay instead.';
var SHOW_BACKDROP_LOADING_DEPRECATED = '$ionicLoading options.showBackdrop has been deprecated. Use options.noBackdrop instead.';
angular.module('ionic.service.loading', [])
@@ -91,7 +88,7 @@ function($animate, $document, $ionicTemplateLoader, $ionicBackdrop, $timeout, $q
$q.when(options.template || options.content || '');
if (!this.isShown) {
this.hasBackdrop = !options.noBackdrop || options.showBackdrop === false;
this.hasBackdrop = !options.noBackdrop;
if (this.hasBackdrop) {
$ionicBackdrop.retain();
}
@@ -143,24 +140,20 @@ function($animate, $document, $ionicTemplateLoader, $ionicBackdrop, $timeout, $q
function showLoader(options) {
options || (options = {});
var delay = options.delay || options.showDelay || 0;
deprecated.field(CONTENT_LOADING_DEPRECATED, $log.warn, options, 'content', options.content);
deprecated.field(SHOW_DELAY_LOADING_DEPRECATED, $log.warn, options, 'showDelay', options.showDelay);
deprecated.field(SHOW_BACKDROP_LOADING_DEPRECATED, $log.warn, options, 'showBackdrop', options.showBackdrop);
loadingShowDelay = $timeout(getLoader, options.delay || options.showDelay || 0)
.then(function(loader) {
loadingShowDelay = $timeout(getLoader, delay).then(function(loader) {
return loader.show(options);
});
return {
hide: deprecated.method(HIDE_LOADING_DEPRECATED, $log.warn, hideLoader),
show: deprecated.method(SHOW_LOADING_DEPRECATED, $log.warn, function() {
hide: deprecated.method(HIDE_LOADING_DEPRECATED, $log.error, hideLoader),
show: deprecated.method(SHOW_LOADING_DEPRECATED, $log.error, function() {
showLoader(options);
}),
setContent: deprecated.method(SET_LOADING_DEPRECATED, $log.warn, function(content) {
setContent: deprecated.method(SET_LOADING_DEPRECATED, $log.error, function(content) {
getLoader().then(function(loader) {
loader.scope.html = content;
loader.show({ template: content });
});
})
};

4
js/ext/angular/test/loading.html
View File

@@ -18,8 +18,8 @@
.controller('LoadingCtrl', function($scope, $ionicLoading) {
$scope.startLoading = function() {
window.loader = $ionicLoading.show({
content: 'Getting current location...',
duration: 2000
template: 'Getting current location...',
duration: 4000
});
};
});