diff options
author | AlexKlimenkov <shurick.klimenkov@gmail.com> | 2015-02-03 14:29:45 +0300 |
---|---|---|
committer | AlexKlimenkov <shurick.klimenkov@gmail.com> | 2015-02-05 13:25:55 +0300 |
commit | f56a0475d90af025e92ec4716ff4e5121992b4fe (patch) | |
tree | c351eff2ed0b007eafed412a513bbec5fb4c5f91 /codebase/sources/ext/dhtmlxscheduler_cookie.js | |
parent | 32504c39dd0183ac30da815e4cf41ac8fa022b99 (diff) | |
download | scheduler-f56a0475d90af025e92ec4716ff4e5121992b4fe.zip scheduler-f56a0475d90af025e92ec4716ff4e5121992b4fe.tar.gz scheduler-f56a0475d90af025e92ec4716ff4e5121992b4fe.tar.bz2 |
[update] version 4.3.0v4.3.0
Diffstat (limited to 'codebase/sources/ext/dhtmlxscheduler_cookie.js')
-rw-r--r-- | codebase/sources/ext/dhtmlxscheduler_cookie.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/codebase/sources/ext/dhtmlxscheduler_cookie.js b/codebase/sources/ext/dhtmlxscheduler_cookie.js index c1c541b..210bf17 100644 --- a/codebase/sources/ext/dhtmlxscheduler_cookie.js +++ b/codebase/sources/ext/dhtmlxscheduler_cookie.js @@ -1,5 +1,5 @@ /* -dhtmlxScheduler v.4.2.0 Stardard +dhtmlxScheduler v.4.3.0 Stardard This software is covered by GPL license. You also can obtain Commercial or Enterprise license to use it in non-GPL project - please contact sales@dhtmlx.com. Usage without proper license is prohibited. @@ -26,11 +26,17 @@ This software is covered by GPL license. You also can obtain Commercial or Enter } var first = true; scheduler.attachEvent("onBeforeViewChange",function(om,od,m,d){ + // if Url plugin is enabled - explicit url values should have more priority than cookies + if (first && scheduler._get_url_nav){ + var url_nav = scheduler._get_url_nav(); + if(url_nav.date || url_nav.mode || url_nav.event){ + first = false; + } + } + if (first){ first = false; - - var data=getCookie("scheduler_settings"); if (data){ |