From 9a62a38440dbdb157ffdeb1756f0184eae777ba6 Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Tue, 21 Oct 2014 21:20:51 +0000
Subject: [PATCH] Change slug and date placeholders to values

Closes #4121
---
 core/client/controllers/post-settings-menu.js | 51 ++++++++-----------
 core/client/templates/post-settings-menu.hbs  |  4 +-
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/core/client/controllers/post-settings-menu.js b/core/client/controllers/post-settings-menu.js
index b2493df782..cac3c9ed0c 100644
--- a/core/client/controllers/post-settings-menu.js
+++ b/core/client/controllers/post-settings-menu.js
@@ -67,21 +67,18 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
             .extend(Ember.PromiseProxyMixin)
             .create(deferred);
     }),
-    /**
-     * The placeholder is the published date of the post,
-     * or the current date if the pubdate has not been set.
-     */
-    publishedAtPlaceholder: Ember.computed('publishedAtValue', function () {
+
+    publishedAtValue: Ember.computed('published_at', function () {
         var pubDate = this.get('published_at');
         if (pubDate) {
             return formatDate(pubDate);
         }
         return formatDate(moment());
     }),
-    publishedAtValue: boundOneWay('published_at', formatDate),
 
     slugValue: boundOneWay('slug'),
-    //Lazy load the slug generator for slugPlaceholder
+
+    //Lazy load the slug generator
     slugGenerator: Ember.computed(function () {
         return SlugGenerator.create({
             ghostPaths: this.get('ghostPaths'),
@@ -160,10 +157,15 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
         return placeholder;
     }),
 
-    seoURL: Ember.computed('slug', 'slugPlaceholder', function () {
+    seoURL: Ember.computed('slug', function () {
         var blogUrl = this.get('config').blogUrl,
-            seoSlug = this.get('slug') ? this.get('slug') : this.get('slugPlaceholder'),
-            seoURL = blogUrl + '/' + seoSlug + '/';
+            seoSlug = this.get('slug') ? this.get('slug') : '',
+            seoURL = blogUrl + '/' + seoSlug;
+
+        // only append a slash to the URL if the slug exists
+        if (seoSlug) {
+            seoURL += '/';
+        }
 
         if (seoURL.length > 70) {
             seoURL = seoURL.substring(0, 70).trim();
@@ -180,33 +182,20 @@ var PostSettingsMenuController = Ember.ObjectController.extend({
             this.addObserver('titleScratch', this, 'titleObserver');
         }
     }.observes('model'),
-    titleObserver: function () {
-        var debounceId;
 
-        if (this.get('isNew') && !this.get('title')) {
-            debounceId = Ember.run.debounce(this, 'generateAndSetSlug', ['slugPlaceholder'], 700);
-        } else if (this.get('title') === '(Untitled)') {
+    titleObserver: function () {
+        var debounceId,
+            title = this.get('title'),
+            slug = this.get('slug');
+
+        // generate a slug if a post is new and doesn't have a title yet or 
+        // if the title is still '(Untitled)' and the slug is unaltered.
+        if ((this.get('isNew') && !title) || title === '(Untitled)' && /^untitled(-\d+){0,1}$/.test(slug)) {
             debounceId = Ember.run.debounce(this, 'generateAndSetSlug', ['slug'], 700);
         }
 
         this.set('debounceId', debounceId);
     },
-    slugPlaceholder: Ember.computed(function (key, value) {
-        var slug = this.get('slug');
-
-        //If the post has a slug, that's its placeholder.
-        if (slug) {
-            return slug;
-        }
-
-        //Otherwise, it's whatever value was set by the
-        //  slugGenerator (below)
-        if (arguments.length > 1) {
-            return value;
-        }
-        //The title will stand in until the actual slug has been generated
-        return this.get('titleScratch');
-    }),
 
     showErrors: function (errors) {
         errors = Ember.isArray(errors) ? errors : [errors];
diff --git a/core/client/templates/post-settings-menu.hbs b/core/client/templates/post-settings-menu.hbs
index e4c5eb6fd9..a07999ef49 100644
--- a/core/client/templates/post-settings-menu.hbs
+++ b/core/client/templates/post-settings-menu.hbs
@@ -12,14 +12,14 @@
             <div class="form-group">
                 <label for="url">Post URL</label>
                 <span class="input-icon icon-link">
-                    {{gh-input class="post-setting-slug" id="url" value=slugValue name="post-setting-slug" focus-out="updateSlug" placeholder=slugPlaceholder selectOnClick="true" stopEnterKeyDownPropagation="true"}}
+                    {{gh-input class="post-setting-slug" id="url" value=slugValue name="post-setting-slug" focus-out="updateSlug" selectOnClick="true" stopEnterKeyDownPropagation="true"}}
                 </span>
             </div>
 
             <div class="form-group">
                 <label for="post-setting-date">Publish Date</label>
                 <span class="input-icon icon-calendar">
-                    {{gh-input class="post-setting-date" id="post-setting-date" value=publishedAtValue name="post-setting-date" focus-out="setPublishedAt" placeholder=publishedAtPlaceholder stopEnterKeyDownPropagation="true"}}
+                    {{gh-input class="post-setting-date" id="post-setting-date" value=publishedAtValue name="post-setting-date" focus-out="setPublishedAt" stopEnterKeyDownPropagation="true"}}
                 </span>
             </div>