Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringProperty.js,v
diff -u -r1.25 -r1.26
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	1 Jul 2014 14:12:20 -0000	1.25
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	20 Oct 2014 09:50:24 -0000	1.26
@@ -976,31 +976,29 @@
 							activity = dialog.dialog('option', 'parentObject');
 						
 						// extract created mappings from UI
-						if (activity instanceof ActivityDefs.BranchingActivity) {
-							activity.conditionsToBranches = [];
-							$('#rangeConditions tr, #complexConditions li', dialog).each(function(){
-								// if it's hidden, then another output was selected, so skip it
-								var mappingEntry = $(this).is(':visible') ? $(this).data('mappingEntry') : null;
-								if (!mappingEntry) {
-									return true;
-								}
-								
-								// new UIID for new conditions
-								if (!mappingEntry.uiid) {
-									mappingEntry.uiid = ++layout.ld.maxUIID;
-								}
-								if (!mappingEntry.condition.conditionUIID) {
-									mappingEntry.condition.conditionUIID = ++layout.ld.maxUIID;
-								}
-								
-								// range conditions can have their names changed
-								var input = $('input', this);
-								if (input.length > 0) {
-									mappingEntry.condition.displayName = input.val();
-								}
-								activity.conditionsToBranches.push(mappingEntry);
-							});
-						}
+						activity.conditionsToBranches = [];
+						$('#rangeConditions tr, #complexConditions li', dialog).each(function(){
+							// if it's hidden, then another output was selected, so skip it
+							var mappingEntry = $(this).is(':visible') ? $(this).data('mappingEntry') : null;
+							if (!mappingEntry) {
+								return true;
+							}
+							
+							// new UIID for new conditions
+							if (!mappingEntry.uiid) {
+								mappingEntry.uiid = ++layout.ld.maxUIID;
+							}
+							if (!mappingEntry.condition.conditionUIID) {
+								mappingEntry.condition.conditionUIID = ++layout.ld.maxUIID;
+							}
+							
+							// range conditions can have their names changed
+							var input = $('input', this);
+							if (input.length > 0) {
+								mappingEntry.condition.displayName = input.val();
+							}
+							activity.conditionsToBranches.push(mappingEntry);
+						});
 												
 						dialog.dialog('close');
 						// go straight to mapping dialog
@@ -1651,7 +1649,7 @@
 		// fill the branches list
 		$.each(branches, function(){
 			var branchTitle = (isGate ? (this == 'open' ? LABELS.GATE_STATE_OPEN : LABELS.GATE_STATE_CLOSED) : this.title)
-							+ (this == defaultBranch ? BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX : ''),
+							+ (this == defaultBranch ? LABELS.BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX : ''),
 				branchElem = $('<div />').click(PropertyLib.selectBranchMappingListItem).appendTo(branchesCell).text(branchTitle);
 			if (isGate) {
 				branchElem.attr('gateState', this);