Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Store mobile flag in Discourse.Session instead of Discourse

This commit is contained in:
Neil Lalonde 2013-08-27 16:50:50 -04:00
parent 3cfc9a7bba
commit b84c7e4efb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse.js
View File

@ -143,7 +143,7 @@ Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
bootbox.animate(false); bootbox.animate(false);
bootbox.backdrop(true); // clicking outside a bootbox modal closes it bootbox.backdrop(true); // clicking outside a bootbox modal closes it
this.set('mobile', $html.hasClass('mobile')); Discourse.Session.currentProp('mobile', $html.hasClass('mobile'))
setInterval(function(){ setInterval(function(){
Discourse.Formatter.updateRelativeAge($('.relative-date')); Discourse.Formatter.updateRelativeAge($('.relative-date'));

2
app/assets/javascripts/discourse/ember/resolver.js
View File

@ -16,7 +16,7 @@ Discourse.Resolver = Ember.DefaultResolver.extend({
@returns {Template} the template (if found) @returns {Template} the template (if found)
**/ **/
resolveTemplate: function(parsedName) { resolveTemplate: function(parsedName) {
if (Discourse.get('mobile')) { if (Discourse.Session.currentProp('mobile')) {
var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/")); var mobileParsedName = this.parseName(parsedName.fullName.replace("template:", "template:mobile/"));
var mobileTemplate = this.findTemplate(mobileParsedName); var mobileTemplate = this.findTemplate(mobileParsedName);
if (mobileTemplate) return mobileTemplate; if (mobileTemplate) return mobileTemplate;