diff --git a/app/controllers/application.js b/app/controllers/application.js index 028e238bd..90ea7cf2e 100644 --- a/app/controllers/application.js +++ b/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 () { diff --git a/app/controllers/posts/post.js b/app/controllers/posts/post.js index dd8551217..eef739ff8 100644 --- a/app/controllers/posts/post.js +++ b/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: { diff --git a/app/controllers/settings/users/user.js b/app/controllers/settings/users/user.js index edb60a371..091b514ff 100644 --- a/app/controllers/settings/users/user.js +++ b/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 () { diff --git a/app/mixins/pagination-controller.js b/app/mixins/pagination-controller.js index 6f1ae2eb6..88c4fd3bf 100644 --- a/app/mixins/pagination-controller.js +++ b/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}); } } }); diff --git a/app/templates/-navbar.hbs b/app/templates/-navbar.hbs index f890c7879..de5e12f20 100644 --- a/app/templates/-navbar.hbs +++ b/app/templates/-navbar.hbs @@ -31,8 +31,8 @@
{{#gh-dropdown-button dropdownName="user-menu" tagName="div" classNames="nav-label clearfix"}} - - + +
{{session.user.name}} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 38d4b2047..1f41e1d48 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -4,7 +4,7 @@ {{partial "navbar"}} {{/unless}} -
+
{{gh-notifications location="top" notify="topNotificationChange"}} {{outlet}}
diff --git a/app/templates/components/gh-file-upload.hbs b/app/templates/components/gh-file-upload.hbs index aa3b79c7e..2cf802973 100644 --- a/app/templates/components/gh-file-upload.hbs +++ b/app/templates/components/gh-file-upload.hbs @@ -1,4 +1,4 @@ - - + + diff --git a/app/templates/components/gh-modal-dialog.hbs b/app/templates/components/gh-modal-dialog.hbs index 2db98df46..b1322a774 100644 --- a/app/templates/components/gh-modal-dialog.hbs +++ b/app/templates/components/gh-modal-dialog.hbs @@ -1,5 +1,5 @@
-
+
{{#if title}}

{{title}}

{{/if}} {{#if showClose}}{{/if}} @@ -8,11 +8,11 @@
{{#if confirm}}
-
@@ -20,4 +20,4 @@
-
\ No newline at end of file +
diff --git a/app/templates/components/gh-notification.hbs b/app/templates/components/gh-notification.hbs index 80e7869bc..9c2b960f1 100644 --- a/app/templates/components/gh-notification.hbs +++ b/app/templates/components/gh-notification.hbs @@ -1,6 +1,6 @@ -
+
{{message.message}} -
\ No newline at end of file +
diff --git a/app/templates/components/gh-role-selector.hbs b/app/templates/components/gh-role-selector.hbs index f226d13fa..6b093f056 100644 --- a/app/templates/components/gh-role-selector.hbs +++ b/app/templates/components/gh-role-selector.hbs @@ -1,5 +1,5 @@ - {{#each role in roles}} - + {{/each}} diff --git a/app/templates/components/gh-uploader.hbs b/app/templates/components/gh-uploader.hbs index 3752d0902..5b9940e5e 100644 --- a/app/templates/components/gh-uploader.hbs +++ b/app/templates/components/gh-uploader.hbs @@ -1,6 +1,6 @@ - +
{{description}}
diff --git a/app/templates/editor-save-button.hbs b/app/templates/editor-save-button.hbs index 13ed2872c..3b04e4810 100644 --- a/app/templates/editor-save-button.hbs +++ b/app/templates/editor-save-button.hbs @@ -1,14 +1,14 @@ - + {{#gh-dropdown-button dropdownName="post-save-menu" classNameBindings=":btn :btn-sm view.isDangerous:btn-red:btn-blue btnopen:active :dropdown-toggle :up"}} Toggle Settings Menu {{/gh-dropdown-button}} {{#gh-dropdown name="post-save-menu" closeOnClick="true" tagName="div" classNames="dropdown editor-options"}}
    -
  • +
  • {{view.publishText}}
    • -
  • +
  • {{view.draftText}}
  • diff --git a/app/templates/editor/edit.hbs b/app/templates/editor/edit.hbs index 6f379a4be..9c12f432a 100644 --- a/app/templates/editor/edit.hbs +++ b/app/templates/editor/edit.hbs @@ -11,7 +11,7 @@ -
    +
    Markdown @@ -23,7 +23,7 @@
    -
    +
    Preview {{gh-count-words model.scratch}}
    diff --git a/app/templates/forgotten.hbs b/app/templates/forgotten.hbs index 93ab7acdd..4aa6eacb9 100644 --- a/app/templates/forgotten.hbs +++ b/app/templates/forgotten.hbs @@ -1,9 +1,9 @@
    - +
    diff --git a/app/templates/modals/signin.hbs b/app/templates/modals/signin.hbs index e77058ba7..5d4ec1f87 100644 --- a/app/templates/modals/signin.hbs +++ b/app/templates/modals/signin.hbs @@ -5,7 +5,7 @@
    {{input class="password" type="password" placeholder="Password" name="password" value=password}}
    - + {{/gh-modal-dialog}} diff --git a/app/templates/modals/upload.hbs b/app/templates/modals/upload.hbs index 55da4d63d..ea19fc871 100644 --- a/app/templates/modals/upload.hbs +++ b/app/templates/modals/upload.hbs @@ -1,7 +1,7 @@ {{#gh-upload-modal action="closeModal" close=true type="action" style="wide" model=model imageType=imageType}}
    - logo - + logo +
    {{/gh-upload-modal}} diff --git a/app/templates/post-settings-menu.hbs b/app/templates/post-settings-menu.hbs index d1a961b12..41fba15ad 100644 --- a/app/templates/post-settings-menu.hbs +++ b/app/templates/post-settings-menu.hbs @@ -1,7 +1,7 @@
    {{#gh-tabs-manager selected="showSubview" id="entry-controls" class="settings-menu-container"}}
    -
    +

    Post Settings

    @@ -68,7 +68,7 @@
    {{! .settings-menu-content }}
    {{! .post-settings-menu }} -
    +
    {{#gh-tab-pane}} {{#if isViewingSubview}}
    diff --git a/app/templates/post-tags-input.hbs b/app/templates/post-tags-input.hbs index 8e676c838..6a24435e8 100644 --- a/app/templates/post-tags-input.hbs +++ b/app/templates/post-tags-input.hbs @@ -13,7 +13,7 @@
    {{view view.tagInputView class="tag-input js-tag-input" id="tags" value=newTagText}} -
      +
        {{#each suggestion in suggestions}} {{#view view.suggestionView suggestion=suggestion}} {{view.suggestion.highlightedName}} diff --git a/app/templates/posts.hbs b/app/templates/posts.hbs index a79ac94cc..5366d8a61 100644 --- a/app/templates/posts.hbs +++ b/app/templates/posts.hbs @@ -4,7 +4,7 @@
        -
        +
        All Posts @@ -14,11 +14,11 @@ {{#view "paginated-scroll-box" tagName="section" classNames="content-list-content js-content-scrollbox"}}
          {{#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"}}

          {{post.model.title}}

          - - + + {{post.authorName}} @@ -26,7 +26,7 @@ {{#if post.model.page}} Page {{else}} -
        {{/view}}
        -
        +
        {{outlet}}
        diff --git a/app/templates/posts/post.hbs b/app/templates/posts/post.hbs index 35b7cc281..8a097e5de 100644 --- a/app/templates/posts/post.hbs +++ b/app/templates/posts/post.hbs @@ -1,13 +1,13 @@
        {{#link-to "posts" tagName="button" class="btn btn-default btn-back"}}Back{{/link-to}}

        Preview

        - {{#if isPublished}} - Published + Published {{else}} Written {{/if}} @@ -16,7 +16,7 @@ {{#if model.author.name}}{{model.author.name}}{{else}}{{model.author.email}}{{/if}}
        - {{#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}}
        diff --git a/app/templates/reset.hbs b/app/templates/reset.hbs index 3bd06c1d4..41011a2cd 100644 --- a/app/templates/reset.hbs +++ b/app/templates/reset.hbs @@ -6,6 +6,6 @@
        {{input value=ne2Password class="password" type="password" placeholder="Confirm Password" name="ne2password" }}
        - +
    diff --git a/app/templates/settings/apps.hbs b/app/templates/settings/apps.hbs index e7cd910ac..cc04dd80f 100644 --- a/app/templates/settings/apps.hbs +++ b/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}} - diff --git a/app/templates/settings/general.hbs b/app/templates/settings/general.hbs index 0d1a3e069..9fcd14798 100644 --- a/app/templates/settings/general.hbs +++ b/app/templates/settings/general.hbs @@ -30,7 +30,7 @@
    {{#if model.logo}} - + {{else}} {{/if}} @@ -40,7 +40,7 @@
    {{#if model.cover}} - cover photo + cover photo {{else}} {{/if}} @@ -72,7 +72,7 @@
    - + {{view "select" id="activeTheme" name="general[activeTheme]" diff --git a/app/templates/settings/tags/settings-menu.hbs b/app/templates/settings/tags/settings-menu.hbs index 6581268d7..170ef89ba 100644 --- a/app/templates/settings/tags/settings-menu.hbs +++ b/app/templates/settings/tags/settings-menu.hbs @@ -1,6 +1,6 @@
    {{#gh-tabs-manager selected="showSubview" class="settings-menu-container"}} -
    +

    Tag Settings

    {{! .settings-menu-pane }} -
    +
    {{#gh-tab-pane}}
    diff --git a/app/templates/settings/users/index.hbs b/app/templates/settings/users/index.hbs index 9ba935026..a8094021f 100644 --- a/app/templates/settings/users/index.hbs +++ b/app/templates/settings/users/index.hbs @@ -48,9 +48,9 @@

    Active users

    {{#each user in activeUsers itemController="settings/users/user"}} - {{#link-to 'settings.users.user' user class="user-list-item" }} - - + {{#link-to 'settings.users.user' user.model class="user-list-item" }} + +
    @@ -58,12 +58,12 @@ {{user.model.name}}
    - Last seen: {{unbound user.last_login}} + Last seen: {{user.last_login}}
    diff --git a/app/templates/settings/users/user.hbs b/app/templates/settings/users/user.hbs index 06a2a2dd3..28ee40fa4 100644 --- a/app/templates/settings/users/user.hbs +++ b/app/templates/settings/users/user.hbs @@ -22,7 +22,7 @@
    -
    +
    @@ -35,7 +35,7 @@
    -
    +
    diff --git a/app/templates/setup.hbs b/app/templates/setup.hbs index 1904081af..21a9c2ff8 100644 --- a/app/templates/setup.hbs +++ b/app/templates/setup.hbs @@ -31,7 +31,7 @@

    Must be at least 8 characters

    - +
    diff --git a/app/templates/signin.hbs b/app/templates/signin.hbs index 3ca687094..1d77a7cd3 100644 --- a/app/templates/signin.hbs +++ b/app/templates/signin.hbs @@ -10,7 +10,7 @@ {{input class="password" type="password" placeholder="Password" name="password" value=model.password}}
    - +
    diff --git a/app/templates/signup.hbs b/app/templates/signup.hbs index c6b040dd0..d6fd2c759 100644 --- a/app/templates/signup.hbs +++ b/app/templates/signup.hbs @@ -26,7 +26,7 @@

    Must be at least 8 characters

    diff --git a/app/views/post-tags-input.js b/app/views/post-tags-input.js index 89f09344c..453eec5f4 100644 --- a/app/views/post-tags-input.js +++ b/app/views/post-tags-input.js @@ -38,7 +38,7 @@ var PostTagsInputView = Ember.View.extend({ styles.push('left', 0); } - return styles.join(';'); + return styles.join(';').htmlSafe(); }), tagInputView: Ember.TextField.extend({ diff --git a/bower.json b/bower.json index 6dcdcc048..66a8f6774 100644 --- a/bower.json +++ b/bower.json @@ -3,10 +3,10 @@ "dependencies": { "Countable": "2.0.2", "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d", - "ember": "1.10.0", - "ember-data": "1.0.0-beta.14.1", + "ember": "1.11.1", + "ember-data": "1.0.0-beta.16.1", "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2", - "ember-resolver": "~0.1.12", + "ember-resolver": "~0.1.15", "ember-simple-auth": "0.7.2", "fastclick": "1.0.0", "google-caja": "5669.0.0", @@ -29,7 +29,7 @@ }, "devDependencies": { "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", - "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1", - "ember-mocha": "0.4.4" + "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.3", + "ember-mocha": "0.6.0" } } diff --git a/package.json b/package.json index ada207274..66d19251a 100644 --- a/package.json +++ b/package.json @@ -19,20 +19,20 @@ "author": "", "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.0.0", - "ember-cli": "^0.2.0", - "ember-cli-app-version": "0.3.2", + "broccoli-asset-rev": "^2.0.2", + "ember-cli": "0.2.2", + "ember-cli-app-version": "0.3.3", "ember-cli-autoprefixer": "0.3.0", "ember-cli-babel": "^4.1.0", - "ember-cli-content-security-policy": "0.3.0", + "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "0.0.8", "ember-cli-htmlbars": "^0.7.4", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", - "ember-cli-mocha": "^0.4.2", + "ember-cli-mocha": "^0.5.0", "ember-cli-sass": "3.1.0", "ember-cli-uglify": "1.0.1", - "ember-data": "^1.0.0-beta.14.1", + "ember-data": "1.0.0-beta.16.1", "ember-export-application-global": "^1.0.2", "fs-extra": "0.16.3", "glob": "^4.0.5"