Merge branch 'ishannz-master'

client/dist/js/bundle.js

@@ -58,9 +58,9 @@ this._super()},onunmatch:function t(){this._super()},_toggleSelection:function e
 }):i.slideUp()},_changeParentId:function t(e){var n=this.find(":input[name=ParentID]").val()
 this.find("#Form_EditForm_ParentType_subpage").data("parentIdValue",n)}}),t('.cms-edit-form [name="CanViewType"], .cms-edit-form [name="CanEditType"], .cms-edit-form #CanCreateTopLevelType').entwine({onmatch:function t(){
 "OnlyTheseUsers"===this.val()&&(this.is(":checked")?this.showList(!0):this.hideList(!0))},onchange:function t(e){"OnlyTheseUsers"===e.target.value?this.showList():this.hideList()},showList:function t(e){
-var n=this.closest(".field")
+var n=this.closest(".field"),a=n.next().filter(".listbox")
-n.addClass("field--merge-below"),n.next().filter(".listbox")[e?"show":"slideDown"]()},hideList:function t(e){var n=this.closest(".field")
+n.addClass("field--merge-below"),a[e?"show":"slideDown"](function(){a.css("overflow","visible")})},hideList:function t(e){var n=this.closest(".field"),a=n.next().filter(".listbox")
-n.next().filter(".listbox")[e?"hide":"slideUp"](function(){n.removeClass("field--merge-below")})}}),t(".cms-edit-form .btn-toolbar #Form_EditForm_action_print").entwine({onclick:function e(n){var a=t(this[0].form).attr("action").replace(/\?.*$/,"")+"/printable/"+t(":input[name=ID]",this[0].form).val()
+a[e?"hide":"slideUp"](function(){n.removeClass("field--merge-below")}).css("overflow","hidden")}}),t(".cms-edit-form .btn-toolbar #Form_EditForm_action_print").entwine({onclick:function e(n){var a=t(this[0].form).attr("action").replace(/\?.*$/,"")+"/printable/"+t(":input[name=ID]",this[0].form).val()
 
 
 return"http://"!=a.substr(0,7)&&(a=t("base").attr("href")+a),window.open(a,"printable"),!1}}),t(".cms-edit-form .btn-toolbar #Form_EditForm_action_rollback").entwine({onclick:function t(e){var n=this.parents("form:first"),a=n.find(":input[name=Version]").val(),i=""

client/src/legacy/CMSMain.EditForm.js

@@ -1,4 +1,3 @@
-
 /**
  * File: CMSMain.EditForm.js
  */
@@ -222,17 +221,22 @@ $.entwine('ss', function($){
       }
     },
     showList: function (instant) {
-      let holder = this.closest('.field');
+      const holder = this.closest('.field');
+      const list = holder.next().filter('.listbox');
 
       holder.addClass('field--merge-below');
-      holder.next().filter('.listbox')[instant ? 'show' : 'slideDown']();
+      list[instant ? 'show' : 'slideDown'](() => {
+        // jquery adding overflow:hidden in hide, this will break listbox display
+        list.css('overflow','visible');
+      });
     },
     hideList: function (instant) {
-      let holder = this.closest('.field');
+      const holder = this.closest('.field');
+      const list = holder.next().filter('.listbox');
 
-      holder.next().filter('.listbox')[instant ? 'hide' : 'slideUp'](() => {
+      list[instant ? 'hide' : 'slideUp'](() => {
         holder.removeClass('field--merge-below');
-      });
+     }).css('overflow','hidden');
     }
   });
 

code/Controllers/CMSMain.php

@@ -434,17 +434,17 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
         // Provide better defaults from filter
         $filter = $this->getSearchFilter();
         if ($filter) {
-        if (!$childrenMethod) {
+            if (!$childrenMethod) {
                 $childrenMethod = $filter->getChildrenMethod();
-        }
+            }
-        if (!$numChildrenMethod) {
+            if (!$numChildrenMethod) {
                 $numChildrenMethod = $filter->getNumChildrenMethod();
             }
             if (!$filterFunction) {
-            $filterFunction = function ($node) use ($filter) {
+                $filterFunction = function ($node) use ($filter) {
-                return $filter->isPageIncluded($node);
+                    return $filter->isPageIncluded($node);
-            };
+                };
-        }
+            }
         }
 
         // Build set from node and begin marking
@@ -495,12 +495,12 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
                 'listViewLink' => Controller::join_links(
                     $linkWithSearch,
                     '?view=listview&ParentID=' . $node->ID
-                    ),
+                ),
                 'rootTitle' => $rootTitle,
                 'extraClass' => $this->getTreeNodeClasses($node),
             ];
-            };
+        };
-        }
+    }
 
     /**
      * Get extra CSS classes for a page's tree node

webpack.config.js

@@ -25,6 +25,7 @@ const SUPPORTED_BROWSERS = [
 
 module.exports = [
   {
+    name: 'js',
     entry: {
       bundle: `${PATHS.CMS_JS_SRC}/bundles/bundle.js`,
       // See https://github.com/webpack/webpack/issues/300#issuecomment-45313650