BUG 9288 Change the source code to permite negative numbers in currency fields (IE) SOLVED

- Don't works on IE
- Add validation for IE browser
This commit is contained in:
Julio Cesar Laura
2012-09-17 17:08:41 -04:00
parent 9f22dfafca
commit 1d351cc97d
6 changed files with 161 additions and 158 deletions

View File

@@ -1021,7 +1021,7 @@ function G_Text(form, element, name)
break;
case 45:
if (me.mType == 'currency') {
newValue = currentValue.substring(0, currentValue.length);
newValue = currentValue.substring(0, currentValue.length).split('');
for (var numI = 0; newValue.length > numI; numI++) {
var campVal = newValue[numI];
if ((typeof(campVal) === 'number' || typeof(campVal) === 'string') && (campVal !== '') && (!isNaN(campVal))) {
@@ -1038,6 +1038,9 @@ function G_Text(form, element, name)
}
}
}
if (newValue.join) {
newValue = newValue.join('');
}
}
break;
default:

View File

@@ -72,7 +72,7 @@ var maborak = function(forceCssLoad){
/* create Stylesheet BEGIN */
//erik: Now the core css is available just by demand
if (this.forceCssLoad === true) {
console.log('cargo css');
//console.log('cargo css');
var st =$dce('link');
st.rel ='stylesheet';
st.type ='text/css';
@@ -756,7 +756,7 @@ var maborak = function(forceCssLoad){
this.serializeToString=function(xml){
return xml.xml || xml.outerHTML || "Error XMLSerializer";
};
};
};
}
};
/**
@@ -1114,11 +1114,11 @@ var maborak = function(forceCssLoad){
{
this.options = {
zip:false
}.concat(options || {});
}.concat(options || {});
if(arguments.length<2 || !this.check()){return false;}
this.toLoad = ((this.options.Absolute===true)?this.options.Path:file).split(",");
if(this.type === 'module' && (this.options.zip===true || this.parent.options.zip===true))
{
{
var tl = [];
for (var i = this.toLoad.length; i > 0; i--)
{
@@ -1618,7 +1618,7 @@ var maborak = function(forceCssLoad){
};
if(!DOM){return position;}
//var m = parseInt(this.parent.dom.getStyle(DOM,"margin"),10) || 0;
position.x=parseInt(DOM.offsetLeft,10);
position.y=parseInt(DOM.offsetTop,10);
//alert(DOM.offsetParent);
@@ -1884,9 +1884,9 @@ var maborak = function(forceCssLoad){
return [window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop];
};
this.getPageSize = function()
{
var xScroll, yScroll;
if (window.innerHeight && window.scrollMaxY) {
{
var xScroll, yScroll;
if (window.innerHeight && window.scrollMaxY) {
xScroll = window.innerWidth + window.scrollMaxX;
yScroll = window.innerHeight + window.scrollMaxY;
} else if (document.body.scrollHeight > document.body.offsetHeight){ // all but Explorer Mac
@@ -1896,12 +1896,12 @@ var maborak = function(forceCssLoad){
xScroll = document.body.offsetWidth;
yScroll = document.body.offsetHeight;
}
var windowWidth, windowHeight;
if (self.innerHeight) { // all except Explorer
if(document.documentElement.clientWidth){
windowWidth = document.documentElement.clientWidth;
windowWidth = document.documentElement.clientWidth;
} else {
windowWidth = self.innerWidth;
}
@@ -1913,21 +1913,21 @@ var maborak = function(forceCssLoad){
} else if (document.body) { // other Explorers
windowWidth = document.body.clientWidth;
windowHeight = document.body.clientHeight;
}
}
// for small pages with total height less then height of the viewport
if(yScroll < windowHeight){
pageHeight = windowHeight;
} else {
} else {
pageHeight = yScroll;
}
// for small pages with total width less then width of the viewport
if(xScroll < windowWidth){
pageWidth = xScroll;
if(xScroll < windowWidth){
pageWidth = xScroll;
} else {
pageWidth = windowWidth;
}
}
return [pageWidth,pageHeight];
};
this.serializer = this.parent.factory(function(DOM,obj)
@@ -2000,7 +2000,7 @@ var maborak = function(forceCssLoad){
}
}
return this.serialized;
};
};
this.select = function()
{
for(var i=0;i<this.DOM.length;i++)

View File

@@ -237,7 +237,7 @@ leimnud.Package.Public({
if(this.drop.selected!==false)
{
var inp = this.drop.elements[this.drop.selected].value;
console.log(this.options.panel[inp]);
//console.log(this.options.panel[inp]);
//console.info("========================");
//console.info(i+":"+this.drop.selected);
//console.info(this.drop.elements[this.drop.selected].value);

View File

@@ -127,7 +127,7 @@ leimnud.Package.Public({
if(this.options.editor.showed===true && this.options.editor.selected==b)
{
if(b=='xml')
{
{
//this.options.buttons.template.disabled=false;
//this.options.buttons.xml.disabled=true;
this.options.buttons.xml.className="dbo";
@@ -154,8 +154,8 @@ leimnud.Package.Public({
{
//this.options.buttons.template.disabled=false;
//this.options.buttons.xml.disabled=true;
this.options.window.textarea.value=this.xmlform.serialize().sReplace('><','>\n<');
this.options.window.textarea.value=this.xmlform.serialize().sReplace('><','>\n<');
this.options.buttons.xml.dv='1';
this.options.buttons.template.dv='0';
this.options.buttons.xml.className="dbo";
@@ -241,11 +241,11 @@ leimnud.Package.Public({
this.tplSetPoints({
html:t
});
this.tplSetDropables();
this.menu_root = new this.parent.module.app.menuRight();
this.options.observers['menu'].register(this.menu_root.remove,this.menu_root);
this.menu_root.make({
@@ -468,12 +468,12 @@ leimnud.Package.Public({
//alert(this.tmp.t.value+":"+this.tmp.n.value+":"+this.tmp.v.value)
}.extend(this);
this.options.panel.add.elements.statusBarButtons[1].onmouseup=this.options.panel.add.remove;
/*g = window.event?evt:g;
this.add_element(this.unique_name(),true,{group:g,type:"other",ufo:7676});*/
}.extend(this,this.isPoint(dom))},
{text:'New section',launch:this.add_section.args(dom)},
{separator:true},
@@ -487,13 +487,13 @@ leimnud.Package.Public({
*/
principal:function(dom)
{
}
}.expand(this);
this.group={
elements:[
{text:'New Element',launch:function(){
console.log(this)
//console.log(this)
}.extend(this)},
]
};
@@ -603,7 +603,7 @@ leimnud.Package.Public({
{
this.tmp.pr[i].passed();
s.push(v);
}
}
}
if(r)
{
@@ -644,7 +644,7 @@ leimnud.Package.Public({
//alert(this.tmp.p.length);
this.add_element(this.tmp.n.value.trim(),true,{group:this.tmp.g,type:this.tmp.t.value}.concat(a));
this.options.panel.add.remove();*/
//alert(this.tmp.t.value+":"+this.tmp.n.value+":"+this.tmp.v.value)
}.extend(this);
};
@@ -721,7 +721,7 @@ leimnud.Package.Public({
}
}
catch(e){
}
this.xmlform.tag_edit(t,db_uid,this.sync_xml_node.args(db_uid));
return false;
@@ -787,7 +787,7 @@ leimnud.Package.Public({
this.options.drag.phantom.make();
this.options.drag.phantom.onInit(event,0);
//return false;
return false;
return false;
};
this.reorder_element=function(event,db_uid)
{
@@ -827,7 +827,7 @@ leimnud.Package.Public({
this.options.drag.phantom.make();
this.options.drag.phantom.onInit(event,0);
//return false;
return false;
};
this.sync_xml_node=function(data,db_uid)
@@ -838,11 +838,11 @@ leimnud.Package.Public({
};
this.sync_dom=function(db_uid,obj)
{
};
this.register_groups_drop=function(group)
{
};
this.register_elements_drop=function(group)
{
@@ -914,7 +914,7 @@ leimnud.Package.Public({
}
else
{
}
}
@@ -955,10 +955,10 @@ leimnud.Package.Public({
else
{
insertRowIn = drop.selected;
begin = true;
begin = true;
}
var t = this.db[drop.elements[insertRowIn].value];
// t.parentNode.insertBefore(new DOM('input').replace(this.db[db_uid]));
// t.parentNode.insertBefore(new DOM('input').replace(this.db[db_uid]));
var n = t.before(new DOM('div')).replace(this.db[db_uid]);
drag.flush();
new this.parent.module.fx.move().make({
@@ -995,7 +995,7 @@ leimnud.Package.Public({
this.phantom_static.remove();
delete this.phantom_static;
}
};
/* Contar elementos en grupo */
@@ -1092,7 +1092,7 @@ leimnud.Package.Public({
{
if(get){return ['size','maxlength','defaultvalue','required','dependentfields','linkfield','other_attribute'];}
options={
}.concat(options || {});
var pd;
this.options.points[options.group].append(
@@ -1108,7 +1108,7 @@ leimnud.Package.Public({
{
if(get){return ['other1','other2','other_attribute'];}
options={
}.concat(options || {});
var pd;
this.options.points[options.group].append(
@@ -1124,7 +1124,7 @@ leimnud.Package.Public({
{
if(get){return ['other_attribute'];}
options={
}.concat(options || {});
var pd;
this.options.points[options.group].append(

File diff suppressed because it is too large Load Diff

View File

@@ -1,14 +1,14 @@
var wizard;
// Extend timeout for all Ext.Ajax.requests to 90 seconds.
// Ext.Ajax is a singleton, this statement will extend the timeout
// for all subsequent Ext.Ajax calls.
// Extend timeout for all Ext.Ajax.requests to 90 seconds.
// Ext.Ajax is a singleton, this statement will extend the timeout
// for all subsequent Ext.Ajax calls.
Ext.Ajax.timeout = 4 * 60 * 1000;
Ext.onReady(function(){
Ext.QuickTips.init();
Ext.QuickTips.init();
wizard = new Ext.ux.Wiz({
height: 520,
width : 780,
@@ -35,10 +35,10 @@ Ext.onReady(function(){
finish: finishInstallation
}
});
// show the wizard
wizard.show();
});
});
function finishInstallation()
{
@@ -63,15 +63,15 @@ function finishInstallation()
//setTimeout("_redirect('"+response.url+"')", 3000);
// Ext.Msg.alert(
// 'ProcessMaker was successfully installed',
// 'Workspace "' + Ext.getCmp('workspace').getValue() + '" was installed correctly now you will be redirected to your new workspace.',
// 'ProcessMaker was successfully installed',
// 'Workspace "' + Ext.getCmp('workspace').getValue() + '" was installed correctly now you will be redirected to your new workspace.',
// function() {_redirectwindow.location = response.url;}
// );
}
else {
PMExt.error('ERROR', response.message, function(){
if (response.canRedirect) {
_redirect(response.uri);
_redirect(response.uri);
}
})
}
@@ -101,7 +101,7 @@ function finishInstallation()
}
function _redirect(_uri){
console.log('redirecting:: '+_uri);
//console.log('redirecting:: '+_uri);
window.location = _uri;
}