FIX: for Ember 2.x support

This commit is contained in:
Robin Ward 2016-11-29 17:15:45 -05:00
parent 983645e233
commit f162247512
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 { withPluginApi } from 'discourse/lib/plugin-api';
import RawHtml from 'discourse/widgets/raw-html'; import RawHtml from 'discourse/widgets/raw-html';
import { cook } from 'discourse/lib/text'; import { cook } from 'discourse/lib/text';
@ -32,15 +31,6 @@ export default {
const siteSettings = container.lookup('site-settings:main'); const siteSettings = container.lookup('site-settings:main');
if (siteSettings.signatures_enabled) { if (siteSettings.signatures_enabled) {
withPluginApi('0.1', attachSignature); 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"> <div class="control-group signatures">
<label class="control-label">Signatures</label> <label class="control-label">Signatures</label>
<div class="controls"> <div class="controls">
<label class='checkbox-label'> <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 See user signatures below posts
</label> </label>
</div> </div>
<div class="controls"> <div class="controls">
<label>Signature</label> <label>Signature</label>
{{#if signaturesAdvancedMode}} {{#if siteSettings.signatures_advanced_mode}}
{{d-editor value=controller.model.custom_fields.signature_raw showUploadModal="showUploadModal"}} {{d-editor value=model.custom_fields.signature_raw showUploadModal="showUploadModal"}}
{{else}} {{else}}
<label class='text-label'> <label class='text-label'>
{{input type="text" value=controller.model.custom_fields.signature_url}} {{input type="text" value=model.custom_fields.signature_url}}
</label> </label>
{{/if}} {{/if}}
</div> </div>