Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Removed BOM from UTF-8 files

Browse Source 
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
This commit is contained in:
Raphaël Doursenaud
2012-07-28 19:04:50 +02:00
committed by Regis Houssin
parent 49bacc6fda
commit d34c4518d2
275 changed files with 50954 additions and 50954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/includes/jquery/plugins/jpicker/jpicker-1.1.6.js
View File

@@ -1,4 +1,4 @@
/*
/*
* jPicker 1.1.6
*
* jQuery Plugin for Photoshop style color picker
@@ -1007,16 +1007,16 @@
expandable: true,
input: $($this)
}
});
if($($this).val()=='')
{
settings.color.active = new Color({ hex: null });
settings.color.current = new Color({ hex: null });
}
else if (ColorMethods.validateHex($($this).val()))
{
settings.color.active = new Color({ hex: $($this).val(), a: settings.color.active.val('a') });
settings.color.current = new Color({ hex: $($this).val(), a: settings.color.active.val('a') });
});
if($($this).val()=='')
{
settings.color.active = new Color({ hex: null });
settings.color.current = new Color({ hex: null });
}
else if (ColorMethods.validateHex($($this).val()))
{
settings.color.active = new Color({ hex: $($this).val(), a: settings.color.active.val('a') });
settings.color.current = new Color({ hex: $($this).val(), a: settings.color.active.val('a') });
}
}
if (settings.window.expandable)
@@ -1656,11 +1656,11 @@
initialize =
function()
{
var win = settings.window,
popup = win.expandable ? $($this).next().find('.Container:first') : null;
container = win.expandable ? $('<div/>') : $($this);
container.addClass('jPicker Container');
if (win.expandable) container.hide();
var win = settings.window,
popup = win.expandable ? $($this).next().find('.Container:first') : null;
container = win.expandable ? $('<div/>') : $($this);
container.addClass('jPicker Container');
if (win.expandable) container.hide();
container.get(0).onselectstart = function(event){ if (event.target.nodeName.toLowerCase() !== 'input') return false; };
// inject html source code - we are using a single table for this control - I know tables are considered bad, but it takes care of equal height columns and
// this control really is tabular data, so I believe it is the right move