From 0b338d91310b627de65f2f31f29579f9cc916428 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 16 Sep 2015 20:37:52 -0500
Subject: [PATCH 1/3] StreamField blocks are now added automatically if there's
 only one block type

---
 .../wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
index 89aeb89a6..ecc734e4a 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
@@ -32,7 +32,11 @@
 
         self.toggle = function() {
             if (self.container.hasClass('stream-menu-closed')) {
+              if (opts.childBlocks.length == 1) {
+                if (opts.onChooseBlock) opts.onChooseBlock(opts.childBlocks[0]);
+              } else {
                 self.show();
+              }
             } else {
                 self.hide();
             }

From 6e2f4275ca400d3b532d0488dc98fff814f03820 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 17 Sep 2015 08:29:13 -0500
Subject: [PATCH 2/3] Reformatted code

---
 .../static_src/wagtailadmin/js/blocks/stream.js        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
index ecc734e4a..110878921 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
@@ -32,11 +32,11 @@
 
         self.toggle = function() {
             if (self.container.hasClass('stream-menu-closed')) {
-              if (opts.childBlocks.length == 1) {
-                if (opts.onChooseBlock) opts.onChooseBlock(opts.childBlocks[0]);
-              } else {
-                self.show();
-              }
+                if (opts.childBlocks.length == 1) {
+                    if (opts.onChooseBlock) opts.onChooseBlock(opts.childBlocks[0]);
+                } else {
+                    self.show();
+                }
             } else {
                 self.hide();
             }

From ab71cba94902a6e75f010571dd90f2a68f734a98 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 17 Sep 2015 09:08:37 -0500
Subject: [PATCH 3/3] Refactored StreamBlockMenu js

---
 .../static_src/wagtailadmin/js/blocks/stream.js            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
index 110878921..97a1ba5ca 100644
--- a/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
+++ b/wagtail/wagtailadmin/static_src/wagtailadmin/js/blocks/stream.js
@@ -30,10 +30,15 @@
             self.container.addClass('stream-menu-closed');
         };
 
+        self.addFirstBlock = function() {
+            if (opts.onChooseBlock) opts.onChooseBlock(opts.childBlocks[0]);
+        };
+
         self.toggle = function() {
             if (self.container.hasClass('stream-menu-closed')) {
                 if (opts.childBlocks.length == 1) {
-                    if (opts.onChooseBlock) opts.onChooseBlock(opts.childBlocks[0]);
+                    /* If there's only one block type, add it automatically */
+                    self.addFirstBlock();
                 } else {
                     self.show();
                 }