Merge pull request #7 from eviltrout/fix-ember-2.4

FIX: for Ember 2.x support
This commit is contained in:
Rafael dos Santos Silva 2016-11-29 20:47:42 -02:00 committed by GitHub
commit fa4ae94e7d
2 changed files with 5 additions and 15 deletions

View File

@ -1,4 +1,3 @@
import Preferences from 'discourse/controllers/preferences';
import { withPluginApi } from 'discourse/lib/plugin-api';
import RawHtml from 'discourse/widgets/raw-html';
import { cook } from 'discourse/lib/text';
@ -32,15 +31,6 @@ export default {
const siteSettings = container.lookup('site-settings:main');
if (siteSettings.signatures_enabled) {
withPluginApi('0.1', attachSignature);
Preferences.reopen({
signaturesEnabled: function() {
return Discourse.SiteSettings.signatures_enabled;
}.property(),
signaturesAdvancedMode: function() {
return Discourse.SiteSettings.signatures_advanced_mode;
}.property()
});
}
}
};

View File

@ -1,19 +1,19 @@
{{#if signaturesEnabled}}
{{#if siteSettings.signatures_enabled}}
<div class="control-group signatures">
<label class="control-label">Signatures</label>
<div class="controls">
<label class='checkbox-label'>
{{input type="checkbox" checked=controller.model.custom_fields.see_signatures}}
{{input type="checkbox" checked=model.custom_fields.see_signatures}}
See user signatures below posts
</label>
</div>
<div class="controls">
<label>Signature</label>
{{#if signaturesAdvancedMode}}
{{d-editor value=controller.model.custom_fields.signature_raw showUploadModal="showUploadModal"}}
{{#if siteSettings.signatures_advanced_mode}}
{{d-editor value=model.custom_fields.signature_raw showUploadModal="showUploadModal"}}
{{else}}
<label class='text-label'>
{{input type="text" value=controller.model.custom_fields.signature_url}}
{{input type="text" value=model.custom_fields.signature_url}}
</label>
{{/if}}
</div>