Merge pull request #692 from gotdibbs/Issue352

Publish button fixes

core/client/views/editor.js

@@ -122,12 +122,16 @@
             });
         },
 
-        setActiveStatus: function setActiveStatus(status, displayText) {
+        setActiveStatus: function (status, displayText) {
             // Set the publish button's action
             $('.js-post-button')
                 .attr('data-status', status)
                 .text(displayText);
 
+            // Remove the animated popup arrow
+            $('.splitbutton-save > a')
+                .removeClass('active');
+
             // Set the active action in the popup
             $('.splitbutton-save .editor-options li')
                 .removeClass('active')
@@ -234,7 +238,10 @@
         },
 
         render: function () {
-            this.$('.js-post-button').text(this.statusMap[this.model.get('status')]);
+            var status = this.model.get('status');
+
+            // Default the selected publish option to the current status of the post.
+            this.setActiveStatus(status, this.statusMap[status]);
         }
 
     });

core/test/unit/export_spec.js

@@ -86,7 +86,8 @@ describe("Export", function () {
     });
 
     describe("002", function () {
-
+        this.timeout(5000);
+        
         should.exist(Exporter001);
 
         it("exports data", function (done) {