From 95af6273aa4b2b709adf77669e5c8cd5c40c5b9a Mon Sep 17 00:00:00 2001 From: Antonio Gamba Bari Date: Mon, 4 Jun 2012 20:30:59 -0400 Subject: [PATCH 1/3] minor change to text color in update status --- smartroom/frontboard-aggregator/css/neoplace.frontboard2.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smartroom/frontboard-aggregator/css/neoplace.frontboard2.css b/smartroom/frontboard-aggregator/css/neoplace.frontboard2.css index 0fbe808..c6a6da6 100644 --- a/smartroom/frontboard-aggregator/css/neoplace.frontboard2.css +++ b/smartroom/frontboard-aggregator/css/neoplace.frontboard2.css @@ -508,6 +508,6 @@ div.none-yet { display: none; } #status{ - color: #000000; + color: #CCCCCC; font-size: 0.7em; } \ No newline at end of file From 21fcea2d0a6ded699e6892718acac59ae4a090b6 Mon Sep 17 00:00:00 2001 From: Antonio Gamba Bari Date: Mon, 4 Jun 2012 21:19:24 -0400 Subject: [PATCH 2/3] fixed moved to front after restoring capture --- .../js/neoplace.frontboard-aggregator.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js b/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js index 8550e9f..1da4b04 100644 --- a/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js +++ b/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js @@ -184,9 +184,9 @@ NEOplace.FrontBoardAggregator = (function() { data: stateObj, success: function () { - console.log("Saved state in frontboard_aggregator_states"); + console.log("Capture saved in collection"); //Sail.app.groupchat.sendEvent(sev); - jQuery("#status").html("State Saved"); + jQuery("#status").html("Captured"); }, error: function (e) { console.log('some error when saving state.'); @@ -268,7 +268,7 @@ NEOplace.FrontBoardAggregator = (function() { }); // bring element to front - jQuery("#board .paper div").focusin(function () { + jQuery("#board .paper div").mousedown(function () { jQuery(this).mousedown(bringDraggableToFront); }); @@ -419,9 +419,6 @@ NEOplace.FrontBoardAggregator = (function() { }).toArray(); var maxZ = Math.max.apply(Math, zs); jQuery(this).css('z-index', maxZ + 1); - - //test make make all position absolute - //jQuery("#quadrant-content-A div").css('position', 'absolute'); }; self.events = { From 9b89aff721eb0df35da408492e886d3d32c08927 Mon Sep 17 00:00:00 2001 From: Antonio Gamba Bari Date: Mon, 4 Jun 2012 22:48:01 -0400 Subject: [PATCH 3/3] added a few tweeks when restoring captured state --- .../js/neoplace.frontboard-aggregator.js | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js b/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js index 1da4b04..3d48ccb 100644 --- a/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js +++ b/smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js @@ -87,8 +87,8 @@ NEOplace.FrontBoardAggregator = (function() { }; // Shows board and toolbars. This function is called when sail is connected. var showHtmlContent = function() { - jQuery("#board").fadeIn("slow"); - jQuery("#toolbars").fadeIn("slow"); + jQuery("#board").fadeIn("fast"); + jQuery("#toolbars").fadeIn("fast"); jQuery("#board").show(); jQuery("#toolbars").show(); }; @@ -251,7 +251,7 @@ NEOplace.FrontBoardAggregator = (function() { var theFullText = jQuery(this).text(); var myDivId = jQuery(this).attr("id"); - jQuery("#"+myDivId + " span").first().fadeIn("slow"); + jQuery("#"+myDivId + " span").first().fadeIn("fast"); jQuery("#"+myDivId + " span").first().show(); jQuery("#"+myDivId).mousedown(bringDraggableToFront); }); @@ -261,14 +261,22 @@ NEOplace.FrontBoardAggregator = (function() { jQuery("#board .assumption").click(function () { var myDivId = jQuery(this).attr("id"); - jQuery("#"+myDivId + " span").first().fadeIn("slow"); + jQuery("#"+myDivId + " span").first().fadeIn("fast"); jQuery("#"+myDivId + " span").first().hide(); jQuery("#"+myDivId).mousedown(bringDraggableToFront); }); + /* + remove opacities + since dbSaveState() can run before the fadeIn("fast") efect finishes, + Some divs are stored with an opacity. + */ + jQuery("#board .paper div").css("opacity", ""); + // bring element to front jQuery("#board .paper div").mousedown(function () { + //jQuery(this).mousedown(bringDraggableToFront); jQuery(this).mousedown(bringDraggableToFront); }); @@ -328,7 +336,7 @@ NEOplace.FrontBoardAggregator = (function() { var theFullText = jQuery(this).text(); var myDivId = jQuery(this).attr("id"); - jQuery("#"+myDivId + " span").first().fadeIn("slow"); + jQuery("#"+myDivId + " span").first().fadeIn("fast"); jQuery("#"+myDivId + " span").first().show(); }); @@ -337,7 +345,7 @@ NEOplace.FrontBoardAggregator = (function() { element.click(function () { var myDivId = jQuery(this).attr("id"); - jQuery("#"+myDivId + " span").first().fadeIn("slow"); + jQuery("#"+myDivId + " span").first().fadeIn("fast"); jQuery("#"+myDivId + " span").first().hide(); }); @@ -365,7 +373,7 @@ NEOplace.FrontBoardAggregator = (function() { // bring the element to the top when clicked element.mousedown(bringDraggableToFront); - element.fadeIn("slow"); + element.fadeIn("fast"); element.css('position', 'absolute');