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

Update Ember.js

This commit is contained in:
Robin Ward 2013-03-19 15:41:11 -04:00
parent 7ecfc0be9c
commit 98847a9eb4
4 changed files with 3398 additions and 2576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/templates/email_logs.js.handlebars
View File

@ -1,6 +1,6 @@
<div class='admin-controls'> <div class='admin-controls'>
<div class='span5 controls'> <div class='span5 controls'>
{{view Discourse.TextField valueBinding="controller.testEmailAddress" placeholderKey="admin.email_logs.test_email_address"}} {{view Discourse.TextField valueBinding="controller.testEmailAddress" placeholderKey="admin.email_logs.test_email_address"}}
</div> </div>
<div class='span10 controls'> <div class='span10 controls'>
<button class='btn' {{action sendTestEmail target="controller"}} {{bindAttr disabled="sendTestEmailDisabled"}}>{{i18n admin.email_logs.send_test}}</button> <button class='btn' {{action sendTestEmail target="controller"}} {{bindAttr disabled="sendTestEmailDisabled"}}>{{i18n admin.email_logs.send_test}}</button>
@ -8,7 +8,7 @@
</div> </div>
</div> </div>
<table class='table'> <table class='table'>
<tr> <tr>
<th>{{i18n admin.email_logs.sent_at}}</th> <th>{{i18n admin.email_logs.sent_at}}</th>
<th>{{i18n user.title}}</th> <th>{{i18n user.title}}</th>
@ -27,8 +27,8 @@
{{else}} {{else}}
&mdash; &mdash;
{{/if}} {{/if}}
</td> </td>
<td><a href='mailto:{{unbound view.content.to_address}}'>{{view.content.to_address}}</a></td> <td><a href='mailto:{{unbound view.content.to_address}}'>{{view.content.to_address}}</a></td>
<td>{{view.content.email_type}}</td> <td>{{view.content.email_type}}</td>
{{/collection}} {{/collection}}
{{/group}} {{/group}}

4
app/assets/javascripts/discourse/templates/topic.js.handlebars
View File

@ -73,7 +73,7 @@
{{#if view.fullyLoaded}} {{#if view.fullyLoaded}}
{{view Discourse.TopicFooterButtonsView topicBinding="controller.content"}} {{view Discourse.TopicFooterButtonsView topicBinding="controller.content"}}
{{#if controller.content.suggested_topics}} {{#if controller.content.suggested_topics.length}}
<div id='suggested-topics'> <div id='suggested-topics'>
<h3>{{i18n suggested_topics.title}}</h3> <h3>{{i18n suggested_topics.title}}</h3>
@ -91,7 +91,7 @@
<th class='num activity' colspan='2'>{{i18n activity}}</th> <th class='num activity' colspan='2'>{{i18n activity}}</th>
</tr> </tr>
{{each controller.content.suggested_topics tagName="tbody" itemTagName="tr" itemViewClass="Discourse.SuggestedTopicView"}} {{each controller.content.suggested_topics itemTagName="tr" itemViewClass="Discourse.SuggestedTopicView"}}
</table> </table>
</div> </div>
<br/> <br/>

2991
app/assets/javascripts/external/ember.js vendored
View File

File diff suppressed because it is too large Load Diff

2971
app/assets/javascripts/external_production/ember.js
View File

File diff suppressed because it is too large Load Diff