MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into shiba-dev

Browse Source
preferencesAboutTextFull
shibakaneki 12 years ago
parent 3d3dee28d2 4a7cd59250
commit e69ffc40e9
3 changed files with 77 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 29
      resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
  2. 29
      resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
  3. 29
      resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js

29
resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
Unescape View File

@ -326,6 +326,15 @@ function init(){
$(".closeItem").live("click", function(){ $(".closeItem").live("click", function(){
if(!shadowOver){ if(!shadowOver){
$(this).parent().remove(); $(this).parent().remove();
if($(".editContainer").size() > 0){
var prev = $(".editContainer:first");
if((prev.position().left == 54) && (prev.position().top != 60))
prev.css("top", "60px");
var prevBottom = prev.position().top + prev.height(),
prevLeft = prev.position().left;
if(prev.next().length)
recursionCall(prevBottom, prevLeft, prev.next());
}
} }
}); });
@ -339,8 +348,7 @@ function init(){
}) })
function recursionCall(prevBottom, prevLeft, curr){ function recursionCall(prevBottom, prevLeft, curr){
var curTop = curr.position().top, var curHeight = curr.height(),
curHeight = curr.height(),
curLeft = curr.position().left; curLeft = curr.position().left;
if(prevLeft == curLeft){ if(prevLeft == curLeft){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
@ -351,7 +359,7 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px"); curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else else
curr.css("top", "60px"); curr.css("top", "60px").css("left", prevLeft + 255 + "px");
} }
prevBottom = curr.position().top + curr.height(), prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left; prevLeft = curr.position().left;
@ -364,7 +372,20 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){ $(window).resize(function(){
//$("#leftDiv,#rightDiv,#shadowDiv").css("height", $(window).height()); if($("#wgt_edit").hasClass("selected")){
if($(".editContainer").size() > 1){
var prev = $(".editContainer:first"),
prevBottom = prev.position().top + prev.height(),
prevLeft = prev.position().left;
recursionCall(prevBottom, prevLeft, prev.next());
}
} else {
var tmp_array = [];
$(".readyTask").each(function(){
tmp_array.push($(this));
});
orderItems(tmp_array);
}
popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
}); });

29
resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
Unescape View File

@ -326,6 +326,15 @@ function init(){
$(".closeItem").live("click", function(){ $(".closeItem").live("click", function(){
if(!shadowOver){ if(!shadowOver){
$(this).parent().remove(); $(this).parent().remove();
if($(".editContainer").size() > 0){
var prev = $(".editContainer:first");
if((prev.position().left == 54) && (prev.position().top != 60))
prev.css("top", "60px");
var prevBottom = prev.position().top + prev.height(),
prevLeft = prev.position().left;
if(prev.next().length)
recursionCall(prevBottom, prevLeft, prev.next());
}
} }
}); });
@ -339,8 +348,7 @@ function init(){
}) })
function recursionCall(prevBottom, prevLeft, curr){ function recursionCall(prevBottom, prevLeft, curr){
var curTop = curr.position().top, var curHeight = curr.height(),
curHeight = curr.height(),
curLeft = curr.position().left; curLeft = curr.position().left;
if(prevLeft == curLeft){ if(prevLeft == curLeft){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
@ -351,7 +359,7 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px"); curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else else
curr.css("top", "60px"); curr.css("top", "60px").css("left", prevLeft + 255 + "px");
} }
prevBottom = curr.position().top + curr.height(), prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left; prevLeft = curr.position().left;
@ -364,7 +372,20 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){ $(window).resize(function(){
//$("#leftDiv,#rightDiv,#shadowDiv").css("height", $(window).height()); if($("#wgt_edit").hasClass("selected")){
if($(".editContainer").size() > 1){
var prev = $(".editContainer:first"),
prevBottom = prev.position().top + prev.height(),
prevLeft = prev.position().left;
recursionCall(prevBottom, prevLeft, prev.next());
}
} else {
var tmp_array = [];
$(".readyTask").each(function(){
tmp_array.push($(this));
});
orderItems(tmp_array);
}
popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
}); });

29
resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
Unescape View File

@ -326,6 +326,15 @@ function init(){
$(".closeItem").live("click", function(){ $(".closeItem").live("click", function(){
if(!shadowOver){ if(!shadowOver){
$(this).parent().remove(); $(this).parent().remove();
if($(".editContainer").size() > 0){
var prev = $(".editContainer:first");
if((prev.position().left == 54) && (prev.position().top != 60))
prev.css("top", "60px");
var prevBottom = prev.position().top + prev.height(),
prevLeft = prev.position().left;
if(prev.next().length)
recursionCall(prevBottom, prevLeft, prev.next());
}
} }
}); });
@ -339,8 +348,7 @@ function init(){
}) })
function recursionCall(prevBottom, prevLeft, curr){ function recursionCall(prevBottom, prevLeft, curr){
var curTop = curr.position().top, var curHeight = curr.height(),
curHeight = curr.height(),
curLeft = curr.position().left; curLeft = curr.position().left;
if(prevLeft == curLeft){ if(prevLeft == curLeft){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
@ -351,7 +359,7 @@ function init(){
if((prevBottom + 15 + curHeight) < ($(window).height() - 54)) if((prevBottom + 15 + curHeight) < ($(window).height() - 54))
curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px"); curr.css("top", prevBottom + 15 + "px").css("left", prevLeft + "px");
else else
curr.css("top", "60px"); curr.css("top", "60px").css("left", prevLeft + 255 + "px");
} }
prevBottom = curr.position().top + curr.height(), prevBottom = curr.position().top + curr.height(),
prevLeft = curr.position().left; prevLeft = curr.position().left;
@ -364,7 +372,20 @@ function init(){
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
$(window).resize(function(){ $(window).resize(function(){
//$("#leftDiv,#rightDiv,#shadowDiv").css("height", $(window).height()); if($("#wgt_edit").hasClass("selected")){
if($(".editContainer").size() > 1){
var prev = $(".editContainer:first"),
prevBottom = prev.position().top + prev.height(),
prevLeft = prev.position().left;
recursionCall(prevBottom, prevLeft, prev.next());
}
} else {
var tmp_array = [];
$(".readyTask").each(function(){
tmp_array.push($(this));
});
orderItems(tmp_array);
}
popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%"); popupBack.css("top", ($(window).height() - 138)*50/$(window).height() + "%");
popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%"); popupBack.css("left", ($(window).width() - 360)*50/$(window).width() + "%");
}); });

Write Preview
Loading…
Cancel
Save