jQuery.cookie is deprecated so use js-cookie instead (+ composer), some js tweaking too

Conflicts:
	ext/blotter/script.js
	ext/handle_pixel/script.js
	ext/index/script.js
	ext/pools/script.js
	lib/shimmie.js
This commit is contained in:
Daku
2016-06-18 06:27:32 +01:00
parent 951323abcf
commit caed53de6a
6 changed files with 24 additions and 176 deletions

View File

@ -33,7 +33,7 @@ $(function(){
} else {
$("#left-block").prependTo("#main-grid")
}
$.cookie("ui-layout-type", layout_type, {path: '/', expires: 365});
Cookies.set("ui-layout-type", layout_type, {path: '/', expires: 365});
zoom("width");
}
@ -55,10 +55,10 @@ $(function(){
} else {
$("#left-block").prependTo("#main-grid")
}
$.cookie("ui-layout-type", layout_type, {path: '/', expires: 365});
Cookies.set("ui-layout-type", layout_type, {path: '/', expires: 365});
zoom("width");
}
current_layout = $.cookie("layout-type");
current_layout = Cookies.get("layout-type");
if (current_layout != null) {
if(current_layout =="top" || current_layout == "bottom"){
leftAddFullSize(current_layout);
@ -91,5 +91,5 @@ function zoom(zoom_type) {
$(".shm-zoomer").val(zoom_type);
$.cookie("ui-image-zoom", zoom_type, {path: '/', expires: 365});
Cookies.set("ui-image-zoom", zoom_type, {path: '/', expires: 365});
}