Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

final tweeks #137

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

final tweeks #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95af627
minor change to text color in update status
agamba Jun 5, 2012
21fcea2
fixed moved to front after restoring capture
agamba Jun 5, 2012
9b89aff
added a few tweeks when restoring captured state
agamba Jun 5, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion smartroom/frontboard-aggregator/css/neoplace.frontboard2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,6 @@ div.none-yet {
display: none;
}
#status{
color: #000000;
color: #CCCCCC;
font-size: 0.7em;
}
31 changes: 18 additions & 13 deletions smartroom/frontboard-aggregator/js/neoplace.frontboard-aggregator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down Expand Up @@ -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.');
Expand Down Expand Up @@ -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);
});
Expand All @@ -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").focusin(function () {
jQuery("#board .paper div").mousedown(function () {
//jQuery(this).mousedown(bringDraggableToFront);
jQuery(this).mousedown(bringDraggableToFront);
});

Expand Down Expand Up @@ -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();

});
Expand All @@ -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();

});
Expand Down Expand Up @@ -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');

Expand Down Expand Up @@ -419,9 +427,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 = {
Expand Down