lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: rename 'text' to 'string'

Browse Source
This commit is contained in:
Regis Houssin 2012-02-06 17:29:19 +01:00
parent 0f4e74fa50
commit cd066b825a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.form.class.php
View File

@ -1,10 +1,10 @@
<?php <?php
/* Copyright (c) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (c) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2006 Marc Barilley/Ocebo <marc@ocebo.com> * Copyright (C) 2006 Marc Barilley/Ocebo <marc@ocebo.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be> * Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerker@telenet.be>
@ -87,7 +87,6 @@ class Form
if ($perm) if ($perm)
{ {
$tmp=explode(':',$typeofdata); $tmp=explode(':',$typeofdata);
if (preg_match('/^(string|email|numeric)$/i',$tmp[0])) $tmp[0] = 'text';
$ret.= '<div class="editkey_'.$tmp[0].'" id="'.$htmlname.'">'; $ret.= '<div class="editkey_'.$tmp[0].'" id="'.$htmlname.'">';
$ret.= $langs->trans($text); $ret.= $langs->trans($text);
$ret.= '</div>'."\n"; $ret.= '</div>'."\n";
@ -237,8 +236,7 @@ class Form
if (preg_match('/^(string|email|numeric)/',$inputType)) if (preg_match('/^(string|email|numeric)/',$inputType))
{ {
$tmp=explode(':',$inputType); $tmp=explode(':',$inputType);
$inputType='text'; $inputType=$tmp[0]; $inputOption=$tmp[1];
$inputOption=$tmp[1];
if (! empty($tmp[2])) $savemethod=$tmp[2]; if (! empty($tmp[2])) $savemethod=$tmp[2];
} }
if (preg_match('/^datepicker/',$inputType)) if (preg_match('/^datepicker/',$inputType))

8
htdocs/core/js/editinplace.js
View File

@ -107,7 +107,7 @@ $(document).ready(function() {
$( '#val_' + $(this).attr('id') ).click(); $( '#val_' + $(this).attr('id') ).click();
}); });
$('.editval_text').editable(urlSaveInPlace, { $('.editval_string').editable(urlSaveInPlace, {
type : 'text', type : 'text',
id : 'field', id : 'field',
width : 300, width : 300,
@ -118,7 +118,7 @@ $(document).ready(function() {
indicator : indicatorInPlace, indicator : indicatorInPlace,
submitdata : function(result, settings) { submitdata : function(result, settings) {
var htmlname = $(this).attr('id').substr(4); var htmlname = $(this).attr('id').substr(4);
return getParameters('text', htmlname); return getParameters('string', htmlname);
}, },
callback : function(result, settings) { callback : function(result, settings) {
var obj = $.parseJSON(result); var obj = $.parseJSON(result);
@ -131,7 +131,7 @@ $(document).ready(function() {
} }
} }
}); });
$('.editkey_text').hover( $('.editkey_string').hover(
function () { function () {
$( '#val_' + $(this).attr('id') ).addClass("editval_hover"); $( '#val_' + $(this).attr('id') ).addClass("editval_hover");
}, },
@ -139,7 +139,7 @@ $(document).ready(function() {
$( '#val_' + $(this).attr('id') ).removeClass("editval_hover"); $( '#val_' + $(this).attr('id') ).removeClass("editval_hover");
} }
); );
$('.editkey_text').click(function() { $('.editkey_string').click(function() {
$( '#val_' + $(this).attr('id') ).click(); $( '#val_' + $(this).attr('id') ).click();
}); });