mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EXPO-11-1-2

Browse Source
remotes/origin/1203
pavel 11 years ago
parent 6118a45ec8
commit ac36c7cec4
4 changed files with 78 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      templates/client/static_client/css/main.css
  2. 2
      templates/client/static_client/css_min/main.min.css
  3. 101
      templates/client/static_client/js/_modules/page.profile.calendar.js
  4. 2
      templates/client/static_client/js_min/_modules/page.profile.calendar.min.js

6
templates/client/static_client/css/main.css
Unescape View File

@ -12921,9 +12921,9 @@ hr + .rq-note {
}
.no-events .c-event .ce-wrap .message{
text-align: center;
-webkit-transition: all 0.8s ease-In;
-o-transition: all 0.8s ease-In;
transition: all 0.8s ease-In;
/*-webkit-transition: all 0.8s ease-In;*/
/*-o-transition: all 0.8s ease-In;*/
/*transition: all 0.8s ease-In;*/
}

2
templates/client/static_client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

101
templates/client/static_client/js/_modules/page.profile.calendar.js
Unescape View File

@ -105,11 +105,15 @@ if (EXPO.profile.calendar) {
return offset;
};
this.$leftScroll = $leftScroll;
this.$rightScroll = $rightScroll;
this.currentOffset = currentWeekOffset();
this.scrollStep = scrollStep;
this.$scrollBox = $scrollBox;
//$(document).ready(function () {
//
//});
this.$messages = []
this.$messages = [];
$(function () {
$noEventsField.each(function () {
@ -152,38 +156,29 @@ if (EXPO.profile.calendar) {
},
keyboard:{
enable:false
}
});
//$('.mCSB_scrollTools_horizontal',$scrollBox).hide();
//$('.mCSB_scrollTools_horizontal',$scrollBox).css({'opacity':0});
//$scrollBox.mCustomScrollbar("scrollTo", currentWeekOffset());
});
$leftScroll.on('click', function () {
if(self.currentOffset >= self.stepWidth){
self.currentOffset -= scrollStep;
$scrollBox.mCustomScrollbar("scrollTo", '+=' + scrollStep);
for (var i =0; i< self.$messages.length; i++){
var marginLeft = parseInt(self.$messages[i].inlineStyle("margin-left"));
if(marginLeft> 0){
self.$messages[i].css({marginLeft:self.currentOffset+'px'});
}
}
}
});
$rightScroll.on('click', function () {
if((self.currentOffset + self.stepWidth) < self.calendarWidth){
},
callbacks:{
onScroll: function(){
self.$leftScroll.off("click").one('click', function () {
self.scrollLeft(self);
});
self.$rightScroll.off("click").one('click', function () {
self.scrollRight(self);
});
self.currentOffset+= scrollStep;
$scrollBox.mCustomScrollbar("scrollTo", '-=' + scrollStep);
for (var i =0; i< self.$messages.length; i++){
var marginLeft = parseInt(self.$messages[i].inlineStyle("margin-left"));
if((marginLeft +self.$messages[i].width())< self.calendarWidth){
self.$messages[i].css({marginLeft:self.currentOffset+'px'});
}
}
}
});
});
$leftScroll.one('click', function () {
self.scrollLeft(self);
});
$rightScroll.one('click', function () {
self.scrollRight(self);
});
$calendarToggle.on('click', function () {
var $switch = $(this);
var $sect = $switch.closest('.ep-sect');
@ -215,6 +210,56 @@ if (EXPO.profile.calendar) {
});
};
that.scrollRight = function (self) {
if(!self){
self = this;
}
self.$rightScroll.off('click');
if((self.currentOffset + self.stepWidth) < self.calendarWidth){
self.currentOffset+= self.scrollStep;
console.log("!!! right scroll fired!");
self.$scrollBox.mCustomScrollbar("scrollTo", '-=' + self.scrollStep);
self.offsetMessages();
}
return false;
};
that.scrollLeft = function (self) {
if(!self){
self = this;
}
self.$leftScroll.off('click');
if(self.currentOffset >= self.stepWidth){
self.currentOffset -= self.scrollStep;
console.log("!!! left scroll fired!");
self.$scrollBox.mCustomScrollbar("scrollTo", '+=' + self.scrollStep);
self.offsetMessages(self);
}
return false;
};
/**
* make message "no marked events" visible on current week slide
* @param self - context
*/
that.offsetMessages = function (self) {
if(!self){
self = this;
}
for (var i =0; i< self.$messages.length; i++){
var marginLeft = parseInt(self.$messages[i].inlineStyle("margin-left"));
if(marginLeft>= 0){
self.$messages[i].addClass("hidden");
self.$messages[i].css({marginLeft:self.currentOffset+'px'});
self.$messages[i].removeClass("hidden");
}
}
};
return that;
}());
}

2
templates/client/static_client/js_min/_modules/page.profile.calendar.min.js vendored
Unescape View File

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var e=(EXPO.common,{});return e.opt={},$(function(){$("#btn_delete").on("click",function(e){e.preventDefault();var t=$("input[name=expo]:checkbox:checked").map(function(){return $(this).val()}).get(),s=$("input[name=conf]:checkbox:checked").map(function(){return $(this).val()}).get(),n=$("input[name=seminar]:checkbox:checked").map(function(){return $(this).val()}).get(),a=$("input[name=webinar]:checkbox:checked").map(function(){return $(this).val()}).get(),i={expo:JSON.stringify(t),conf:JSON.stringify(s),seminar:JSON.stringify(n),webinar:JSON.stringify(a)};$.get("/profile/calendar/remove/",i,function(e){e.success&&location.reload()})})}),e.init=function(e){$.extend(this.opt,e);var t=this,s=$("#"+this.opt.scrollBoxId),n=$("#"+this.opt.calenadrId),a=(n.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),i=$("#"+this.opt.scrollRightId),o=$("."+this.opt.noEventsClass),r=$("."+this.opt.calendarToggleClass),c=this.opt.cellWidth*this.opt.cellsToScroll,l=0,d=function(){var e,s,n=0,a=0,i=t.opt.cellWidth,o=$("#"+t.opt.calenadrId),r=o.find("td."+t.opt.currentDayClass).index(),c=t.opt.cellsToScroll,l=o.find("."+t.opt.daysClass+" td").length;return t.stepWidth=c*i,t.calendarWidth=i*l,r>0?(r++,e=l/c,s=l/r,a=e-s,t.currentDay=r,a?(a=Math.floor(a-1),n=c*a*i):n=0):(t.currentDay=0,n=0),n};this.currentOffset=d(),this.$messages=[],$(function(){o.each(function(){$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>t.stepWidth&&t.$messages.push($(".message",$(this)).width(t.stepWidth).css({marginLeft:t.currentOffset+"px"})):$(this).find("."+t.opt.eventWrapClass).addClass("small")}),$("."+t.opt.eventsClass).each(function(){l++,3==l&&$(this).addClass("grey"),4==l&&($(this).addClass("grey"),l=0)})}),$(window).load(function(){s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+EXPO.profile.calendar.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1}})}),a.on("click",function(){if(t.currentOffset>=t.stepWidth){t.currentOffset-=c,s.mCustomScrollbar("scrollTo","+="+c);for(var e=0;e<t.$messages.length;e++){var n=parseInt(t.$messages[e].inlineStyle("margin-left"));n>0&&t.$messages[e].css({marginLeft:t.currentOffset+"px"})}}}),i.on("click",function(){if(t.currentOffset+t.stepWidth<t.calendarWidth){t.currentOffset+=c,s.mCustomScrollbar("scrollTo","-="+c);for(var e=0;e<t.$messages.length;e++){var n=parseInt(t.$messages[e].inlineStyle("margin-left"));n+t.$messages[e].width()<t.calendarWidth&&t.$messages[e].css({marginLeft:t.currentOffset+"px"})}}}),r.on("click",function(){var e=$(this),t=e.closest(".ep-sect"),s=t.children("div.ep-sect-body");return t.hasClass("eps-opened")?(i.hide(),a.hide(),s.stop().animate({opacity:0},300,function(){t.removeClass("eps-opened")})):(i.show(),a.show(),s.stop().animate({opacity:1},300,function(){t.addClass("eps-opened")})),!1})},e}();
var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var e=(EXPO.common,{});return e.opt={},$(function(){$("#btn_delete").on("click",function(e){e.preventDefault();var t=$("input[name=expo]:checkbox:checked").map(function(){return $(this).val()}).get(),s=$("input[name=conf]:checkbox:checked").map(function(){return $(this).val()}).get(),o=$("input[name=seminar]:checkbox:checked").map(function(){return $(this).val()}).get(),l=$("input[name=webinar]:checkbox:checked").map(function(){return $(this).val()}).get(),n={expo:JSON.stringify(t),conf:JSON.stringify(s),seminar:JSON.stringify(o),webinar:JSON.stringify(l)};$.get("/profile/calendar/remove/",n,function(e){e.success&&location.reload()})})}),e.init=function(e){$.extend(this.opt,e);var t=this,s=$("#"+this.opt.scrollBoxId),o=$("#"+this.opt.calenadrId),l=(o.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),n=$("#"+this.opt.scrollRightId),c=$("."+this.opt.noEventsClass),i=$("."+this.opt.calendarToggleClass),r=this.opt.cellWidth*this.opt.cellsToScroll,a=0,f=function(){var e,s,o=0,l=0,n=t.opt.cellWidth,c=$("#"+t.opt.calenadrId),i=c.find("td."+t.opt.currentDayClass).index(),r=t.opt.cellsToScroll,a=c.find("."+t.opt.daysClass+" td").length;return t.stepWidth=r*n,t.calendarWidth=n*a,i>0?(i++,e=a/r,s=a/i,l=e-s,t.currentDay=i,l?(l=Math.floor(l-1),o=r*l*n):o=0):(t.currentDay=0,o=0),o};this.$leftScroll=l,this.$rightScroll=n,this.currentOffset=f(),this.scrollStep=r,this.$scrollBox=s,this.$messages=[],$(function(){c.each(function(){$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>t.stepWidth&&t.$messages.push($(".message",$(this)).width(t.stepWidth).css({marginLeft:t.currentOffset+"px"})):$(this).find("."+t.opt.eventWrapClass).addClass("small")}),$("."+t.opt.eventsClass).each(function(){a++,3==a&&$(this).addClass("grey"),4==a&&($(this).addClass("grey"),a=0)})}),$(window).load(function(){s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+EXPO.profile.calendar.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1},callbacks:{onScroll:function(){t.$leftScroll.off("click").one("click",function(){t.scrollLeft(t)}),t.$rightScroll.off("click").one("click",function(){t.scrollRight(t)})}}})}),l.one("click",function(){t.scrollLeft(t)}),n.one("click",function(){t.scrollRight(t)}),i.on("click",function(){var e=$(this),t=e.closest(".ep-sect"),s=t.children("div.ep-sect-body");return t.hasClass("eps-opened")?(n.hide(),l.hide(),s.stop().animate({opacity:0},300,function(){t.removeClass("eps-opened")})):(n.show(),l.show(),s.stop().animate({opacity:1},300,function(){t.addClass("eps-opened")})),!1})},e.scrollRight=function(e){return e||(e=this),e.$rightScroll.off("click"),e.currentOffset+e.stepWidth<e.calendarWidth&&(e.currentOffset+=e.scrollStep,console.log("!!! right scroll fired!"),e.$scrollBox.mCustomScrollbar("scrollTo","-="+e.scrollStep),e.offsetMessages()),!1},e.scrollLeft=function(e){return e||(e=this),e.$leftScroll.off("click"),e.currentOffset>=e.stepWidth&&(e.currentOffset-=e.scrollStep,console.log("!!! left scroll fired!"),e.$scrollBox.mCustomScrollbar("scrollTo","+="+e.scrollStep),e.offsetMessages(e)),!1},e.offsetMessages=function(e){e||(e=this);for(var t=0;t<e.$messages.length;t++){var s=parseInt(e.$messages[t].inlineStyle("margin-left"));s>=0&&(e.$messages[t].addClass("hidden"),e.$messages[t].css({marginLeft:e.currentOffset+"px"}),e.$messages[t].removeClass("hidden"))}},e}();
Write Preview
Loading…
Cancel
Save