hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
This commit is contained in:
Romain Neutron
2013-11-14 17:52:52 +01:00
parent fda56a74c9 e2602da9b6
commit 3451895515
17 changed files with 32922 additions and 23527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/skins/prod/jquery.edit.js
View File

@@ -1740,7 +1740,7 @@ function startThisEditing(sbas_id, what, regbasprid, ssel) {
},
stop: function () {
hsplit1();
setPref('editing_top_box', Math.floor($('#EDIT_TOP').height() * 100 / $('#EDIT_ALL').height()) + '%');
setPref('editing_top_box', Math.floor($('#EDIT_TOP').height() * 100 / $('#EDIT_ALL').height()));
setSizeLimits();
}
});
@@ -1753,7 +1753,7 @@ function startThisEditing(sbas_id, what, regbasprid, ssel) {
setPreviewEdit();
},
stop: function () {
setPref('editing_right_box', Math.floor($('#divS').width() * 100 / $('#EDIT_MID_L').width()) + '%');
setPref('editing_right_box', Math.floor($('#divS').width() * 100 / $('#EDIT_MID_L').width()));
vsplit1();
setSizeLimits();
}
@@ -1769,7 +1769,7 @@ function startThisEditing(sbas_id, what, regbasprid, ssel) {
setPreviewEdit();
},
stop: function () {
setPref('editing_left_box', Math.floor($('#EDIT_MID_R').width() * 100 / $('#EDIT_MID').width()) + '%');
setPref('editing_left_box', Math.floor($('#EDIT_MID_R').width() * 100 / $('#EDIT_MID').width()));
vsplit2();
setSizeLimits();
}