pixl-xyapp 2.1.25 → 2.1.27

package/js/page.js

@@ -228,48 +228,7 @@ window.Page = class Page {
 		}
 		
 		html += '<select multiple ' + compose_attribs(args) + '>';
-		for (var idx = 0, len = opts.length; idx < len; idx++) {
-			var item = opts[idx];
-			var item_name = '';
-			var item_value = '';
-			var attribs = {};
-			
-			if (isa_hash(item)) {
-				if (('label' in item) && ('data' in item)) {
-					item_name = item.label;
-					item_value = item.data;
-				}
-				else {
-					item_name = item.title;
-					item_value = item.id;
-				}
-				if (item.icon) attribs['data-icon'] = item.icon;
-				if (item.abbrev) attribs['data-abbrev'] = item.abbrev;
-				if (item.class) attribs['data-class'] = item.class;
-				if (item.group) attribs['data-group'] = item.group;
-			}
-			else if (isa_array(item)) {
-				item_value = item[0];
-				item_name = item[1];
-			}
-			else {
-				item_name = item_value = item;
-			}
-			
-			attribs.value = item_value;
-			if (find_in_array(values, item_value)) attribs.selected = 'selected';
-			html += '<option ' + compose_attribs(attribs) + '>' + encode_entities(item_name) + '</option>';
-			opt_values.push( item_value );
-		} // foreach opt
-		
-		if (auto_add) {
-			values.forEach( function(value) {
-				if (!find_in_array(opt_values, value)) {
-					html += '<option value="' + encode_attrib_entities(value) + '" selected="selected">' + encode_entities(value) + '</option>';
-				}
-			} );
-		} // auto-add
-		
+		html += render_menu_options( opts, values, auto_add );
 		html += '</select>';
 		return html;
 	}
@@ -942,13 +901,13 @@ window.Page = class Page {
 			
 			app.api.post( 'user/resume_session', {}, function(resp) {
 				if (resp.user) {
-					Debug.trace("User Session Resume: " + resp.username);
+					Debug.trace('user', "User Session Resume: " + resp.username);
 					Dialog.hideProgress();
 					app.doUserLogin( resp );
 					Nav.refresh();
 				}
 				else {
-					Debug.trace("User cookie is invalid, redirecting to login page");
+					Debug.trace('user', "User cookie is invalid, redirecting to login page");
 					app.setPref('username', '');
 					setTimeout( function() { Nav.go('Login'); }, 1 );
 				}

package/js/popover.js

@@ -36,6 +36,11 @@ var Popover = {
 			else {
 				$box.css('top', '' + Math.floor( rect.bottom + 16 ) + 'px');
 				$box.addClass('top');
+				
+				if (rect.bottom + 16 + height > win.height) {
+					// off bottom of window, nudge back into bounds
+					$box.css('top', '' + Math.floor( (win.height - height) - 16 ) + 'px');
+				}
 			}
 			
 			if (shrinkwrap) {

package/js/tools.js

@@ -323,10 +323,13 @@ function pluralize(word, num) {
 	else return word;
 }
 
-function render_menu_options(items, sel_value, auto_add) {
+function render_menu_options(items, sel_values, auto_add) {
 	// return HTML for menu options
 	var html = '';
-	var found = false;
+	var sel_map = {};
+	
+	if (!sel_values) sel_values = [];
+	if (typeof(sel_values) == 'string') sel_values = [sel_values];
 	
 	for (var idx = 0, len = items.length; idx < len; idx++) {
 		var item = items[idx];
@@ -337,8 +340,13 @@ function render_menu_options(items, sel_value, auto_add) {
 		if (isa_hash(item)) {
 			if (('label' in item) && ('items' in item)) {
 				// optgroup, recurse for items within
+				var sub_items = deep_copy_object(item.items);
+				if (sub_items[0] && (typeof(sub_items[0]) == 'object')) {
+					sub_items[0].group = item.label;
+				}
+				
 				html += '<optgroup label="' + encode_attrib_entities(item.label) + '">';
-				html += render_menu_options( item.items, sel_value, false );
+				html += render_menu_options( sub_items, sel_values, false );
 				html += '</optgroup>';
 				continue;
 			}
@@ -351,6 +359,7 @@ function render_menu_options(items, sel_value, auto_add) {
 				item_value = item.id;
 			}
 			if (item.icon) attribs['data-icon'] = item.icon;
+			if (item.abbrev) attribs['data-abbrev'] = item.abbrev;
 			if (item.class) attribs['data-class'] = item.class;
 			if (item.group) attribs['data-group'] = item.group;
 		}
@@ -363,15 +372,19 @@ function render_menu_options(items, sel_value, auto_add) {
 		}
 		
 		attribs.value = item_value;
-		if (item_value == sel_value) attribs.selected = 'selected';
+		if (sel_values.includes(item_value)) {
+			attribs.selected = 'selected';
+			sel_map[item_value] = 1;
+		}
 		html += '<option ' + compose_attribs(attribs) + '>' + encode_entities(item_name) + '</option>';
-		
-		if (item_value == sel_value) found = true;
 	}
 	
-	if (!found && (str_value(sel_value) != '') && auto_add) {
-		html += '<option value="' + encode_attrib_entities(sel_value) + '" selected="selected">' + encode_entities(sel_value) + '</option>';
-	}
+	if (sel_values.length && auto_add) {
+		sel_values.forEach( function(sel_value) {
+			if (sel_map[sel_value]) return;
+			html += '<option value="' + encode_attrib_entities(sel_value) + '" selected="selected">' + encode_entities(sel_value) + '</option>';
+		} ); // foreach selected value
+	} // yes add
 	
 	return html;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pixl-xyapp",
-	"version": "2.1.25",
+	"version": "2.1.27",
 	"description": "Front-end web application and theme for xyOps.",
 	"author": "Joseph Huckaby <jhuckaby@pixlcore.com>",
 	"homepage": "https://github.com/pixlcore/pixl-xyapp",