Merge branch 'develop'

Author: Dmi3yy

manager/actions/welcome.static.php

@@ -552,7 +552,7 @@ function getRecentInfoRowTpl() {
 						<tr>
 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>
 							<td data-toggle="collapse" data-target=".collapse[+id+]"><a class="[+status+]" title="[%edit_resource%]" href="index.php?a=3&amp;id=[+id+]">[+pagetitle+]</a></td>
-							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right">[+editedon:math("%s+[(server_offset_time)]"):dateFormat+]</td>
+							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right text-nowrap">[+editedon:math("%s+[(server_offset_time)]"):dateFormat+]</td>
 							<td data-toggle="collapse" data-target=".collapse[+id+]">[+username+]</td>
 							<td style="text-align: right;" class="actions">[+edit_btn+][+preview_btn+][+delete_btn+][+publish_btn+][+info_btn+]</td>
 						</tr>

manager/frames/mainmenu.php

@@ -431,9 +431,11 @@
 if(is_array($menu)) {
 	$newmenu = array();
 	foreach($menu as $item){
-		$newmenu = array_merge($newmenu, unserialize($item));
+		if(is_array(unserialize($item))){ 
+			$newmenu = array_merge($newmenu, unserialize($item));
+		}
 	} 
-	$sitemenu = $newmenu;
+	if(count($newmenu)> 0) $sitemenu = $newmenu;
 }
 
 if(file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/includes/menu.class.inc.php')) {

manager/media/style/default/js/modx.js

@@ -555,7 +555,7 @@
 				}
 			},
 			toggle: function() {
-				if(modx.isMobile) {
+				if(modx.isMobile || w.innerWidth <= modx.minWidth) {
 					if(d.body.classList.contains('sidebar-closed')) {
 						d.body.classList.remove('sidebar-closed');
 						localStorage.setItem('MODX_widthSideBar', 0);
@@ -852,7 +852,7 @@
 			treeAction: function(e, id, title) {
 				if(e.ctrlKey) return;
 				var el = d.getElementById('node' + id).firstChild,
-					treepageclick = parseInt(el.dataset.treepageclick),
+					treepageclick = el.dataset.treepageclick,
 					showchildren = parseInt(el.dataset.showchildren),
 					openfolder = parseInt(el.dataset.openfolder);
 				title = title || (el.dataset && el.dataset.titleEsc);
@@ -919,6 +919,7 @@
 				var tree = d.getElementById('tree'),
 					el = d.getElementById('node' + id) || e.target;
 				if(el) {
+					if(!el.dataset.contextmenu) el = el.firstChild;	
 					if(el.dataset.contextmenu) {
 						e.target.dataset.toggle = '#contextmenu';
 						modx.hideDropDown(e);
@@ -975,7 +976,7 @@
 						this.selectedObjectName = title;
 						this.dopopup(this.ctx, x + 10, y)
 					} else {
-						el = el.firstChild;
+						//el = el.firstChild;
 						var ctx = d.getElementById('mx_contextmenu');
 						e.target.dataset.toggle = '#mx_contextmenu';
 						modx.hideDropDown(e);
@@ -1538,4 +1539,4 @@ function reloadElementsInTree() {
 			return null;
 		}
 	}
-})();
+})();