Tidy writeDynaList() (joomla#12184)

* Cleaned writeDynaList() in core.js * Removed explanation comments * removed all API changes * updated compressed core.js
amone4 · Apr 21, 2018 · 8524a16 · 8524a16
1 parent e59cc17
commit 8524a16
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
@@ -534,27 +534,19 @@ Joomla.editors.instances = Joomla.editors.instances || {
 	 */
 	window.writeDynaList = function ( selectParams, source, key, orig_key, orig_val, element ) {
 		var html = '<select ' + selectParams + '>',
-			hasSelection = key == orig_key,
-			i = 0,
-			selected, x, item;
+			hasSelection = key == orig_key, i, selected, item;
 
-		for ( x in source ) {
-			if (!source.hasOwnProperty(x)) { continue; }
-
-			item = source[ x ];
+		for (i = 0 ; i < source.length; i++) {
+			item = source[ i ];
 
 			if ( item[ 0 ] != key ) { continue; }
 
-			selected = '';
+			selected = hasSelection ? orig_val == item[ 1 ] : i === 0;
 
-			if ( ( hasSelection && orig_val == item[ 1 ] ) || ( !hasSelection && i === 0 ) ) {
-				selected = 'selected="selected"';
-			}
-
-			html += '<option value="' + item[ 1 ] + '" ' + selected + '>' + item[ 2 ] + '</option>';
-
-			i++;
+			html += '<option value="' + item[ 1 ] + '"' + (selected ? ' selected="selected"' : '') + '>'
+				+ item[ 2 ] + '</option>';
 		}
+
 		html += '</select>';
 
 		if (element) {

diff --git a/media/system/js/core.js b/media/system/js/core.js