IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the last of the Discourse globals in our templates

Browse Source
This commit is contained in:
Robin Ward 2014-09-11 17:13:03 -04:00
parent cedc409461
commit 52094fe554
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/initializers/mobile.js.es6
View File

@ -3,9 +3,12 @@
**/ **/
export default { export default {
name: 'mobile', name: 'mobile',
after: 'inject-objects',
initialize: function() { initialize: function(container) {
Discourse.Mobile.init(); Discourse.Mobile.init();
var site = container.lookup('site:main');
site.set('mobileView', Discourse.Mobile.mobileView);
} }
}; };

2
app/assets/javascripts/discourse/templates/composer.js.handlebars
View File

@ -79,7 +79,7 @@
<div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}> <div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}>
{{i18n upload_selector.uploading}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n cancel}}</a> {{i18n upload_selector.uploading}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n cancel}}</a>
</div> </div>
{{#if Discourse.Mobile.mobileView}} {{#if site.mobileView}}
<a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n upload}}</a> <a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n upload}}</a>
<input type="file" id="mobile-uploader" /> <input type="file" id="mobile-uploader" />
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/modal/history.js.handlebars
View File

@ -10,7 +10,7 @@
{{#if loading}}<div id='revision-loading'><i class='fa fa-spinner fa-spin'></i>{{i18n loading}}</div>{{/if}} {{#if loading}}<div id='revision-loading'><i class='fa fa-spinner fa-spin'></i>{{i18n loading}}</div>{{/if}}
<div id="display-modes"> <div id="display-modes">
<button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n post.revisions.displays.inline.title}}" {{action displayInline}}>{{{i18n post.revisions.displays.inline.button}}}</button> <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n post.revisions.displays.inline.title}}" {{action displayInline}}>{{{i18n post.revisions.displays.inline.button}}}</button>
{{#unless Discourse.Mobile.mobileView}} {{#unless site.mobileView}}
<button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side.title}}" {{action displaySideBySide}}>{{{i18n post.revisions.displays.side_by_side.button}}}</button> <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side.title}}" {{action displaySideBySide}}>{{{i18n post.revisions.displays.side_by_side.button}}}</button>
<button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side_markdown.title}}" {{action displaySideBySideMarkdown}}>{{{i18n post.revisions.displays.side_by_side_markdown.button}}}</button> <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side_markdown.title}}" {{action displaySideBySideMarkdown}}>{{{i18n post.revisions.displays.side_by_side_markdown.button}}}</button>
{{/unless}} {{/unless}}

8
app/assets/javascripts/discourse/templates/search/post_result.js.handlebars
View File

@ -2,9 +2,9 @@
<span class='topic'> <span class='topic'>
{{i18n search.post_format post_number=post_number username=username}} {{i18n search.post_format post_number=post_number username=username}}
</span> </span>
{{#unless Discourse.Mobile.mobileView}} {{#unless controller.site.mobileView}}
<span class='blurb'> <span class='blurb'>
{{{unbound blurb}}} {{{unbound blurb}}}
</span> </span>
{{/unless}} {{/unless}}
</a> </a>

8
app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
View File

@ -2,9 +2,9 @@
<span class='topic'> <span class='topic'>
{{topic-status topic=topic disableActions=true}}<span class='topic-title'>{{unbound topic.title}}</span>{{category-badge topic.category}} {{topic-status topic=topic disableActions=true}}<span class='topic-title'>{{unbound topic.title}}</span>{{category-badge topic.category}}
</span> </span>
{{#unless Discourse.Mobile.mobileView}} {{#unless controller.site.mobileView}}
<span class='blurb'> <span class='blurb'>
{{age created_at}} - {{{unbound blurb}}} {{age created_at}} - {{{unbound blurb}}}
</span> </span>
{{/unless}} {{/unless}}
</a> </a>