Index: lams_central/web/includes/javascript/progressBar.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/progressBar.js,v diff -u -r1.13.2.3 -r1.13.2.4 --- lams_central/web/includes/javascript/progressBar.js 2 Jul 2015 12:29:03 -0000 1.13.2.3 +++ lams_central/web/includes/javascript/progressBar.js 15 Jul 2015 11:17:55 -0000 1.13.2.4 @@ -274,10 +274,10 @@ .attr(DEFAULT_TEXT_ATTRIBUTES); text.attr({ - 'opacity' : 0, + 'opacity' : 0, 'font-size' : 9, - 'stroke' : COLOR_GATE_TEXT, - 'cursor' : 'pointer' + 'stroke' : COLOR_GATE_TEXT, + 'cursor' : 'pointer' }); act.decoration.push(text); @@ -288,10 +288,11 @@ var edge = paper.path(act.path); edge.attr({ - 'opacity' : 0, - 'stroke' : COLOR_CURRENT_ACTIVITY, + 'opacity' : 0, + 'stroke' : COLOR_CURRENT_ACTIVITY, 'stroke-width' : 3, - 'cursor' : 'pointer' + 'fill' : 'none', + 'cursor' : 'pointer' }); act.decoration.push(edge); } else { Index: lams_central/web/includes/javascript/authoring/authoringActivity.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringActivity.js,v diff -u -r1.38.2.16 -r1.38.2.17 --- lams_central/web/includes/javascript/authoring/authoringActivity.js 8 Jul 2015 14:36:55 -0000 1.38.2.16 +++ lams_central/web/includes/javascript/authoring/authoringActivity.js 15 Jul 2015 11:17:55 -0000 1.38.2.17 @@ -823,7 +823,6 @@ 'stroke-dasharray' : '5,3', 'fill' : 'none' }); - object.items.append(object.items.selectEffect); // if it's "import part" select children activities if (activitiesOnlySelectable) { @@ -1383,7 +1382,7 @@ */ removeSelectEffect : function(object) { // remove the effect from the given object or the selected one, whatever it is - if (!object) { + if (!object || !object.items.selectEffect) { object = layout.selectedObject; } Index: lams_central/web/includes/javascript/authoring/authoringMenu.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringMenu.js,v diff -u -r1.34.2.4 -r1.34.2.5 --- lams_central/web/includes/javascript/authoring/authoringMenu.js 8 Jul 2015 14:36:55 -0000 1.34.2.4 +++ lams_central/web/includes/javascript/authoring/authoringMenu.js 15 Jul 2015 11:17:55 -0000 1.34.2.5 @@ -352,7 +352,8 @@ var ctx = crop.workspace.getContext('2d'), w = crop.x2 - crop.x, - h = crop.y2 - crop.y, + // slight adjustment so bottom activities are not clipped + h = crop.y2 - crop.y + 2, cut = ctx.getImageData(crop.x, crop.y, w, h); crop.workspace.width = w; @@ -834,20 +835,4 @@ $('.templateContainer').height($('#ldDescriptionDiv').height() + $('#canvas').height() - 10); }); } - - - /* - ,zoom : function(){ - var zoomButton = $('#zoomButton > span'); - if (layout.isZoomed) { - paper.setViewBox(0, 0, paper.width, paper.height, true); - layout.isZoomed = false; - zoomButton.text('Zoom out'); - } else { - paper.setViewBox(-paper.width / 2, -paper.height / 2, paper.width * 2, paper.height * 2, true); - layout.isZoomed = true; - zoomButton.text('Cancel zoom'); - } - } - */ }; \ No newline at end of file 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.2.5 -r1.25.2.6 --- lams_central/web/includes/javascript/authoring/authoringProperty.js 6 Jul 2015 13:01:44 -0000 1.25.2.5 +++ lams_central/web/includes/javascript/authoring/authoringProperty.js 15 Jul 2015 11:17:55 -0000 1.25.2.6 @@ -63,6 +63,9 @@ branchingActivity = activity.branchingActivity, redrawNeeded = false, newTitle = $('.propertiesContentFieldTitle', content).val(); + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != branchingActivity.title) { if (GeneralLib.nameValidator.test(newTitle)) { @@ -183,7 +186,9 @@ activity = content.data('parentObject'), redrawNeeded = false, newTitle = $('.propertiesContentFieldTitle', content).val(); - + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != activity.title) { if (GeneralLib.nameValidator.test(newTitle)) { @@ -288,7 +293,9 @@ redrawNeeded = false, newTitle = $('.propertiesContentFieldTitle', content).val(), newGroupCount = +$('.propertiesContentFieldGroupCount', content).val(); - + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != activity.title) { if (GeneralLib.nameValidator.test(newTitle)) { @@ -395,7 +402,9 @@ label = content.data('parentObject'), redrawNeeded = false, newTitle = $('.propertiesContentFieldTitle', content).val(); - + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != label.title) { if (GeneralLib.nameValidator.test(newTitle)) { @@ -437,7 +446,9 @@ var content = $(this).closest('.dialogContainer'), activity = content.data('parentObject'), newTitle = $('.propertiesContentFieldTitle', content).val(); - + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != activity.title) { if (GeneralLib.nameValidator.test(newTitle)) { @@ -505,7 +516,9 @@ activity = content.data('parentObject'), redrawNeeded = false, newTitle = $('.propertiesContentFieldTitle', content).val(); - + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != activity.title) { if (GeneralLib.nameValidator.test(newTitle)) { @@ -566,7 +579,9 @@ newTitle = $('.propertiesContentFieldTitle', content).val(), color = region.items.shape.attr('fill'), newColor = $('.propertiesContentFieldColor', content).val(); - + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != region.title) { if (GeneralLib.nameValidator.test(newTitle)) { @@ -616,7 +631,9 @@ activity = content.data('parentObject'), redrawNeeded = false, newTitle = $('.propertiesContentFieldTitle', content).val(); - + if (newTitle == '') { + newTitle = undefined; + } // validate and save the title if (newTitle != activity.title) { if (GeneralLib.nameValidator.test(newTitle)) {