Ember 1.11.1

- remove `bind-attr` all over the place

core/client/app/controllers/application.js

@@ -13,7 +13,7 @@ var ApplicationController = Ember.Controller.extend({
     }),
 
     userImageBackground: Ember.computed('userImage', function () {
-        return 'background-image: url(' + this.get('userImage') + ')';
+        return `background-image: url(${this.get('userImage')})`.htmlSafe();
     }),
 
     userImageAlt: Ember.computed('session.user.name', function () {

core/client/app/controllers/posts/post.js

@@ -12,7 +12,7 @@ var PostController = Ember.Controller.extend({
     }),
 
     authorAvatarBackground: Ember.computed('authorAvatar', function () {
-        return 'background-image: url(' + this.get('authorAvatar') + ')';
+        return `background-image: url(${this.get('authorAvatar')})`.htmlSafe();
     }),
 
     actions: {

core/client/app/controllers/settings/users/user.js

@@ -16,31 +16,21 @@ var SettingsUserController = Ember.Controller.extend({
     coverDefault: Ember.computed('ghostPaths', function () {
         return this.get('ghostPaths.url').asset('/shared/img/user-cover.png');
     }),
-
-    userDefault: Ember.computed('ghostPaths', function () {
-        return this.get('ghostPaths.url').asset('/shared/img/user-image.png');
-    }),
-
-    cover: Ember.computed('user.cover', 'coverDefault', function () {
-        var cover = this.get('user.cover');
-
-        if (Ember.isBlank(cover)) {
-            cover = this.get('coverDefault');
-        }
-
-        return 'background-image: url(' + cover + ')';
+    coverImageBackground: Ember.computed('user.cover', 'coverDefault', function () {
+        var url = this.get('user.cover') || this.get('coverDefault');
+        return `background-image: url(${url})`.htmlSafe();
     }),
 
     coverTitle: Ember.computed('user.name', function () {
         return this.get('user.name') + '\'s Cover Image';
     }),
 
-    image: Ember.computed('imageUrl', function () {
-        return 'background-image: url(' + this.get('imageUrl') + ')';
+    userDefault: Ember.computed('ghostPaths', function () {
+        return this.get('ghostPaths.url').asset('/shared/img/user-image.png');
     }),
-
-    imageUrl: Ember.computed('user.image', function () {
-        return this.get('user.image') || this.get('userDefault');
+    userImageBackground: Ember.computed('user.image', 'userDefault', function () {
+        var url = this.get('user.image') || this.get('userDefault');
+        return `background-image: url(${url})`.htmlSafe();
     }),
 
     last_login: Ember.computed('user.last_login', function () {

core/client/app/mixins/pagination-controller.js

@@ -53,7 +53,7 @@ var PaginationControllerMixin = Ember.Mixin.create({
 
         resetPagination: function () {
             this.set('paginationSettings.page', 1);
-            this.store.metaForType('tag', {pagination: undefined});
+            this.store.setMetaDataFor('tag', {pagination: undefined});
         }
     }
 });

core/client/app/templates/-navbar.hbs

@@ -31,8 +31,8 @@
 
     <div class="nav-item user-menu">
         {{#gh-dropdown-button dropdownName="user-menu" tagName="div" classNames="nav-label clearfix"}}
-            <span class="image" {{bind-attr style=userImageBackground}}>
-                <img {{bind-attr src="userImage" title="userImageAlt"}}>
+            <span class="image" style={{userImageBackground}}>
+                <img src={{userImage}} title={{userImageAlt}}>
             </span>
             <div class="name">
                 {{session.user.name}} <i class="icon-chevron-down"></i>

core/client/app/templates/application.hbs

@@ -4,7 +4,7 @@
     {{partial "navbar"}}
 {{/unless}}
 
-<main id="gh-main" class="viewport" role="main" {{bind-attr data-notification-count=topNotificationCount}}>
+<main id="gh-main" class="viewport" role="main" data-notification-count={{topNotificationCount}}>
     {{gh-notifications location="top" notify="topNotificationChange"}}
     {{outlet}}
 </main>

core/client/app/templates/components/gh-file-upload.hbs

@@ -1,4 +1,4 @@
-    <input data-url="upload" class="btn btn-green" type="file" name="importfile" {{bind-attr accept=options.acceptEncoding}}>
-    <button type="submit" class="btn btn-blue" id="startupload" {{bind-attr disabled=uploadButtonDisabled}} {{action "upload"}}>
-        {{uploadButtonText}}
-    </button>
+<input data-url="upload" class="btn btn-green" type="file" name="importfile" accept="{{options.acceptEncoding}}">
+<button type="submit" class="btn btn-blue" id="startupload" disabled={{uploadButtonDisabled}} {{action "upload"}}>
+    {{uploadButtonText}}
+</button>

core/client/app/templates/components/gh-modal-dialog.hbs

@@ -1,5 +1,5 @@
 <div class="modal-container js-modal-container" {{action "closeModal"}}>
-    <article {{bind-attr class="klass :js-modal"}}>
+    <article class="{{klass}} js-modal">
         <section class="modal-content" {{action "noBubble" bubbles=false preventDefault=false}}>
             {{#if title}}<header class="modal-header"><h1>{{title}}</h1></header>{{/if}}
             {{#if showClose}}<a class="close" href="" title="Close" {{action "closeModal"}}><span class="hidden">Close</span></a>{{/if}}
@@ -8,16 +8,16 @@
             </section>
             {{#if confirm}}
             <footer class="modal-footer">
-                <button type="button" {{bind-attr class="rejectButtonClass :js-button-reject"}} {{action "confirm" "reject"}}>
+                <button type="button" class="{{rejectButtonClass}} js-button-reject" {{action "confirm" "reject"}}>
                     {{confirm.reject.text}}
                 </button><!--
                 Required to strip the white-space between buttons
-                --><button type="button" {{bind-attr class="acceptButtonClass :js-button-accept"}} {{action "confirm" "accept"}}>
+                --><button type="button" class="{{acceptButtonClass}} js-button-accept" {{action "confirm" "accept"}}>
                     {{confirm.accept.text}}
                 </button>
             </footer>
             {{/if}}
         </section>
     </article>
 </div>
-<div class="modal-background js-modal-background"></div>
+<div class="modal-background js-modal-background"></div>

core/client/app/templates/components/gh-notification.hbs

@@ -1,6 +1,6 @@
-<section {{bind-attr class=":js-notification typeClass"}}>
+<section class="js-notification {{typeClass}}">
     <span class="notification-message">
         {{message.message}}
     </span>
     <button class="close" {{action "closeNotification"}}><span class="hidden">Close</span></button>
-</section>
+</section>

core/client/app/templates/components/gh-role-selector.hbs

@@ -1,5 +1,5 @@
-<select {{bind-attr id=selectId name=selectName}}>
+<select id="{{selectId}}" name="{{selectName}}">
 {{#each role in roles}}
-<option {{bind-attr value=role.id}}>{{role.name}}</option>
+<option value={{role.id}}>{{role.name}}</option>
 {{/each}}
 </select>

core/client/app/templates/components/gh-uploader.hbs

@@ -1,6 +1,6 @@
 <span class="media">
     <span class="hidden">Image Upload</span>
 </span>
-<img class="js-upload-target" {{bind-attr src=imageSource}} />
+<img class="js-upload-target" src="{{imageSource}}" />
 <div class="description">{{description}}<strong></strong></div>
 <input data-url="upload" class="js-fileupload main fileupload" type="file" name="uploadimage">

core/client/app/templates/editor-save-button.hbs

@@ -1,14 +1,14 @@
-<button type="button" {{action "save"}} {{bind-attr class=":btn :btn-sm view.isDangerous:btn-red:btn-blue :js-publish-button" }}>{{view.saveText}}</button>
+<button type="button" {{action "save"}} class="btn btn-sm js-publish-button {{if view.isDangerous 'btn-red' 'btn-blue'}}">{{view.saveText}}</button>
 {{#gh-dropdown-button dropdownName="post-save-menu" classNameBindings=":btn :btn-sm view.isDangerous:btn-red:btn-blue btnopen:active :dropdown-toggle :up"}}
     <i class="options"></i>
     <span class="sr-only">Toggle Settings Menu</span>
 {{/gh-dropdown-button}}
 {{#gh-dropdown name="post-save-menu" closeOnClick="true" tagName="div" classNames="dropdown editor-options"}}
     <ul class="dropdown-menu dropdown-triangle-bottom-right">
-        <li {{bind-attr class=":post-save-publish willPublish:active"}}>
+        <li class="post-save-publish {{if willPublish 'active'}}">
             <a {{action "setSaveType" "publish"}} href="#">{{view.publishText}}</a>
         </li>
-        <li {{bind-attr class=":post-save-draft willPublish::active"}}>
+        <li class="post-save-draft {{unless willPublish 'active'}}">
             <a {{action "setSaveType" "draft"}} href="#">{{view.draftText}}</a>
         </li>
         <li class="divider delete"></li>

core/client/app/templates/editor/edit.hbs

@@ -11,7 +11,7 @@
         </section>
     </header>
 
-    <section {{bind-attr class=":entry-markdown :js-entry-markdown isPreview::active"}}>
+    <section class="entry-markdown js-entry-markdown {{unless isPreview 'active'}}">
         <header {{action "togglePreview" false}} class="floatingheader">
             <small>Markdown</small>
             <a class="markdown-help" href="" {{action "openModal" "markdown"}}><span class="hidden">What is Markdown?</span></a>
@@ -23,7 +23,7 @@
         </section>
     </section>
 
-    <section {{bind-attr class=":entry-preview :js-entry-preview isPreview:active"}}>
+    <section class="entry-preview js-entry-preview {{if isPreview 'active'}}">
         <header {{action "togglePreview" true}} class="floatingheader">
             <small>Preview <span class="entry-word-count js-entry-word-count">{{gh-count-words model.scratch}}</span></small>
         </header>

core/client/app/templates/forgotten.hbs

@@ -1,9 +1,9 @@
 <section class="forgotten-box js-forgotten-box fade-in">
     <form id="forgotten" class="forgotten-form" method="post" novalidate="novalidate">
         <div class="email-wrap">
-            {{gh-trim-focus-input value=email class="email" type="email" placeholder="Email Address" name="email" 
+            {{gh-trim-focus-input value=email class="email" type="email" placeholder="Email Address" name="email"
             autofocus="autofocus" autocapitalize="off" autocorrect="off"}}
         </div>
-        <button class="btn btn-blue" type="submit" {{action "submit"}} {{bind-attr disabled=submitting}}>Send new password</button>
+        <button class="btn btn-blue" type="submit" {{action "submit"}} disabled={{submitting}}>Send new password</button>
     </form>
 </section>

core/client/app/templates/modals/signin.hbs

@@ -5,7 +5,7 @@
             <div class="password-wrap">
                 {{input class="password" type="password" placeholder="Password" name="password" value=password}}
             </div>
-            <button class="btn btn-blue" type="submit" {{action "validateAndAuthenticate"}} {{bind-attr disabled=submitting}}>Log in</button>
+            <button class="btn btn-blue" type="submit" {{action "validateAndAuthenticate"}} disabled={{submitting}}>Log in</button>
        </form>
 
 {{/gh-modal-dialog}}

core/client/app/templates/modals/upload.hbs

@@ -1,7 +1,7 @@
 {{#gh-upload-modal action="closeModal" close=true type="action" style="wide" model=model imageType=imageType}}
   <section class="js-drop-zone">
-      <img class="js-upload-target" {{bind-attr src=src}} alt="logo">
-      <input data-url="upload" class="js-fileupload main" type="file" name="uploadimage" {{bind-attr accept=acceptEncoding}} >
+      <img class="js-upload-target" src="{{src}}" alt="logo">
+      <input data-url="upload" class="js-fileupload main" type="file" name="uploadimage" accept="{{acceptEncoding}}" >
   </section>
 
 {{/gh-upload-modal}}

core/client/app/templates/post-settings-menu.hbs

@@ -1,7 +1,7 @@
 <div class="content-cover" {{action "closeSettingsMenu"}}></div>
 {{#gh-tabs-manager selected="showSubview" id="entry-controls" class="settings-menu-container"}}
 <div id="entry-controls">
-    <div {{bind-attr class="isViewingSubview:settings-menu-pane-out-left:settings-menu-pane-in :settings-menu :settings-menu-pane"}}>
+    <div class="{{if isViewingSubview 'settings-menu-pane-out-left' 'settings-menu-pane-in'}} settings-menu settings-menu-pane">
         <div class="settings-menu-header">
             <h4>Post Settings</h4>
             <button class="close icon-x settings-menu-header-action" {{action "closeSettingsMenu"}}><span class="hidden">Close</span></button>
@@ -68,7 +68,7 @@
         </div>{{! .settings-menu-content }}
     </div>{{! .post-settings-menu }}
 
-    <div {{bind-attr class="isViewingSubview:settings-menu-pane-in:settings-menu-pane-out-right :settings-menu :settings-menu-pane"}}>
+    <div class="{{if isViewingSubview 'settings-menu-pane-in' 'settings-menu-pane-out-right'}} settings-menu settings-menu-pane">
     {{#gh-tab-pane}}
         {{#if isViewingSubview}}
         <div class="settings-menu-header subview">

core/client/app/templates/post-tags-input.hbs

@@ -13,7 +13,7 @@
 <div class="publish-bar-tags-input">
     <input type="hidden" class="tags-holder" id="tags-holder">
     {{view view.tagInputView class="tag-input js-tag-input" id="tags" value=newTagText}}
-    <ul class="suggestions dropdown-menu dropdown-triangle-bottom" {{bind-attr style=view.overlayStyles}}>
+    <ul class="suggestions dropdown-menu dropdown-triangle-bottom" style={{view.overlayStyles}}>
         {{#each suggestion in suggestions}}
             {{#view view.suggestionView suggestion=suggestion}}
                 <a href="javascript:void(0);">{{view.suggestion.highlightedName}}</a>

core/client/app/templates/posts.hbs

@@ -4,7 +4,7 @@
 </header>
 
 <div class="page-content">
-    <section {{bind-attr class=":content-list :js-content-list postListFocused:keyboard-focused"}}>
+    <section class="content-list js-content-list {{if postListFocused 'keyboard-focused'}}">
         <header class="floatingheader">
             <section class="content-filter">
                 <small>All Posts</small>
@@ -14,19 +14,19 @@
         {{#view "paginated-scroll-box" tagName="section" classNames="content-list-content js-content-scrollbox"}}
         <ol class="posts-list">
             {{#each post in controller itemController="posts/post" itemView="post-item-view" itemTagName="li"}}
-                {{#link-to "posts.post" post class="permalink" alternateActive=view.active title="Edit this post"}}
+                {{#link-to "posts.post" post.model class="permalink" alternateActive=view.active title="Edit this post"}}
                     <h3 class="entry-title">{{post.model.title}}</h3>
                     <section class="entry-meta">
-                        <span class="avatar" {{bind-attr style=post.authorAvatarBackground}}>
-                            <img {{bind-attr src="post.authorAvatar" title="post.authorName"}}>
+                        <span class="avatar" style={{post.authorAvatarBackground}}>
+                            <img src="{{post.authorAvatar}}" title="{{post.authorName}}">
                         </span>
                         <span class="author">{{post.authorName}}</span>
                         <span class="status">
                             {{#if post.isPublished}}
                                 {{#if post.model.page}}
                                     <span class="page">Page</span>
                                 {{else}}
-                                    <time datetime="{{unbound post.model.published_at}}" class="date published">
+                                    <time datetime="{{post.model.published_at}}" class="date published">
                                         Published {{gh-format-timeago post.model.published_at}}
                                     </time>
                                 {{/if}}
@@ -40,7 +40,7 @@
         </ol>
         {{/view}}
     </section>
-    <section {{bind-attr class=":content-preview :js-content-preview postContentFocused:keyboard-focused"}}>
+    <section class="content-preview js-content-preview {{if postContentFocused 'keyboard-focused'}}">
         {{outlet}}
     </section>
 </div>

core/client/app/templates/posts/post.hbs

@@ -1,13 +1,13 @@
 <header class="post-preview-header clearfix">
     {{#link-to "posts" tagName="button" class="btn btn-default btn-back"}}Back{{/link-to}}
     <h2 class="page-title">Preview</h2>
-    <button type="button" {{bind-attr class="model.featured:featured:unfeatured"}} title="Feature this post" {{action "toggleFeatured"}}>
+    <button type="button" class="{{if model.featured 'featured' 'unfeatured'}}" title="Feature this post" {{action "toggleFeatured"}}>
         <span class="sr-only">Star</span>
     </button>
     <small class="post-published-by">
         <span class="status">
             {{#if isPublished}}
-                <a {{bind-attr title="model.title" href="model.url"}}>Published</a>
+                <a title="{{model.title}}" href="{{model.url}}">Published</a>
             {{else}}
                 Written
             {{/if}}
@@ -16,7 +16,7 @@
         <span class="author">{{#if model.author.name}}{{model.author.name}}{{else}}{{model.author.email}}{{/if}}</span>
     </small>
     <section class="post-controls">
-        {{#link-to "editor.edit" this class="btn btn-default post-edit"}} Edit{{/link-to}}
+        {{#link-to "editor.edit" model class="btn btn-default post-edit"}} Edit{{/link-to}}
     </section>
 </header>
 

core/client/app/templates/reset.hbs

@@ -6,6 +6,6 @@
         <div class="password-wrap">
             {{input value=ne2Password class="password" type="password" placeholder="Confirm Password" name="ne2password" }}
         </div>
-        <button class="btn btn-blue" type="submit" {{bind-attr disabled='submitting'}}>Reset Password</button>
+        <button class="btn btn-blue" type="submit" disabled={{submitting}}>Reset Password</button>
     </form>
 </section>

core/client/app/templates/settings/apps.hbs

@@ -16,7 +16,7 @@
                 {{#if appController.model.package}}{{appController.model.package.name}} - {{appController.model.package.version}}{{else}}{{appController.model.name}} - package.json missing :({{/if}}
             </td>
             <td>
-                <button type="button" {{action toggleApp appController}} {{bind-attr class=":btn :js-button-active activeClass:btn-red inactiveClass:btn-green activeClass:js-button-deactivate"}}>
+                <button type="button" {{action toggleApp appController}} class="btn js-button-active {{if activeClass 'btn-red js-button-deactivate'}} {{if inactiveClass 'btn-green'}}">
                     {{appController.buttonText}}
                 </button>
             </td>

core/client/app/templates/settings/general.hbs

@@ -30,7 +30,7 @@
         <div class="form-group">
             <label>Blog Logo</label>
             {{#if model.logo}}
-                <img class="blog-logo" {{bind-attr src=model.logo}} alt="logo" role="button" {{action "openModal" "upload" this "logo"}}>
+                <img class="blog-logo" src="{{model.logo}}" alt="logo" role="button" {{action "openModal" "upload" this "logo"}}>
             {{else}}
                 <button type="button" class="btn btn-green js-modal-logo" {{action "openModal" "upload" this "logo"}}>Upload Image</button>
             {{/if}}
@@ -40,7 +40,7 @@
         <div class="form-group">
             <label>Blog Cover</label>
             {{#if model.cover}}
-                <img class="blog-cover" {{bind-attr src=model.cover}} alt="cover photo" role="button" {{action "openModal" "upload" this "cover"}}>
+                <img class="blog-cover" src="{{model.cover}}" alt="cover photo" role="button" {{action "openModal" "upload" this "cover"}}>
             {{else}}
                 <button type="button" class="btn btn-green js-modal-cover" {{action "openModal" "upload" this "cover"}}>Upload Image</button>
             {{/if}}
@@ -72,7 +72,7 @@
 
             <div class="form-group for-select">
                 <label for="activeTheme">Theme</label>
-                <span class="gh-select" {{bind-attr data-select-text=selectedTheme.label}} tabindex="0">
+                <span class="gh-select" data-select-text="{{selectedTheme.label}}" tabindex="0">
                    {{view "select"
                        id="activeTheme"
                        name="general[activeTheme]"

core/client/app/templates/settings/tags/settings-menu.hbs

@@ -1,6 +1,6 @@
 <div class="content-cover" {{action "closeSettingsMenu"}}></div>
 {{#gh-tabs-manager selected="showSubview" class="settings-menu-container"}}
-    <div {{bind-attr class="isViewingSubview:settings-menu-pane-out-left:settings-menu-pane-in :settings-menu :settings-menu-pane"}}>
+    <div class="{{if isViewingSubview 'settings-menu-pane-out-left' 'settings-menu-pane-in'}} settings-menu settings-menu-pane">
         <div class="settings-menu-header">
             <h4>Tag Settings</h4>
             <button class="close icon-x settings-menu-header-action" {{action "closeSettingsMenu"}}>
@@ -42,7 +42,7 @@
         </div>
     </div>{{! .settings-menu-pane }}
 
-    <div {{bind-attr class="isViewingSubview:settings-menu-pane-in:settings-menu-pane-out-right :settings-menu :settings-menu-pane"}}>
+    <div class="{{if isViewingSubview 'settings-menu-pane-in' 'settings-menu-pane-out-right'}} settings-menu settings-menu-pane">
         {{#gh-tab-pane}}
             <div class="settings-menu-header subview">
                 <button {{action "closeSubview"}} class="back icon-chevron-left settings-menu-header-action"><span class="hidden">Back</span></button>