github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update ember-cloaking to remove dependency on I18n

Browse Source
This commit is contained in:
Robin Ward
2014-01-17 16:40:43 -05:00
parent 3bbe595d10
commit 55397361be
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vendor/assets/javascripts/ember-cloaking.js vendored
View File

@ -3,8 +3,8 @@
/**
Display a list of cloaked items
@class CloakedContainerView
@extends Ember.View
@class CloakedCollectionView
@extends Ember.CollectionView
@namespace Ember
**/
Ember.CloakedCollectionView = Ember.CollectionView.extend({
@ -136,9 +136,7 @@
this.setProperties({topVisible: null, bottomVisible: null});
}
var toCloak = childViews.slice(0, topView).concat(childViews.slice(bottomView+1)),
loadingView = childViews[bottomView + 1];
var toCloak = childViews.slice(0, topView).concat(childViews.slice(bottomView+1));
Em.run.schedule('afterRender', function() {
toUncloak.forEach(function (v) { v.uncloak(); });
toCloak.forEach(function (v) { v.cloak(); });
@ -148,7 +146,7 @@
var checkView = childViews[j];
if (!checkView.get('containedView')) {
if (!checkView.get('loading')) {
checkView.$().html("<div class='spinner'>" + I18n.t('loading') + "</div>");
checkView.$().html(this.get('loadingHTML') || "Loading...");
}
return;
}
@ -171,10 +169,9 @@
},
willDestroyElement: function() {
$(document).bind('touchmove.ember-cloak');
$(window).bind('scroll.ember-cloak');
$(document).unbind('touchmove.ember-cloak');
$(window).unbind('scroll.ember-cloak');
}
});