From: Linda Nichols Date: Tue, 24 Jun 2014 03:34:24 +0000 (+0000) Subject: fixed errors X-Git-Tag: v4.6.0-beta~23^2~3 X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=912b0b914b23f389f3789d7ead3a4ffab6826cef;p=xtuple fixed errors --- diff --git a/enyo-client/application/source/widgets/relation.js b/enyo-client/application/source/widgets/relation.js index ddf316425..0ca32d7b9 100644 --- a/enyo-client/application/source/widgets/relation.js +++ b/enyo-client/application/source/widgets/relation.js @@ -29,7 +29,7 @@ regexp:true, undef:true, trailing:true, white:true, strict:false */ collection: "XM.ContactRelationCollection", list: "XV.ContactList", published: { - showAddress: false, + showAddress: false }, descriptionComponents: [ {name: "jobTitleRow", controlClasses: "enyo-inline", showing: false, components: [ diff --git a/enyo-client/extensions/source/crm/client/widgets/chart.js b/enyo-client/extensions/source/crm/client/widgets/chart.js index 016dae7e0..4b2a9408f 100644 --- a/enyo-client/extensions/source/crm/client/widgets/chart.js +++ b/enyo-client/extensions/source/crm/client/widgets/chart.js @@ -51,11 +51,11 @@ trailing:true, white:true*/ parameters: [{ attribute: "targetClose", operator: ">=", - value: XT.date.applyTimezoneOffset(XV.Date.prototype.textToDate("0"), true) + value: XT.date.applyTimezoneOffset(XV.DateWidget.prototype.textToDate("0"), true) }, { attribute: "targetClose", operator: "<=", - value: XT.date.applyTimezoneOffset(XV.Date.prototype.textToDate("+30"), true) + value: XT.date.applyTimezoneOffset(XV.DateWidget.prototype.textToDate("+30"), true) }] }, totalField: "amount" diff --git a/enyo-client/extensions/source/sales/client/widgets/chart.js b/enyo-client/extensions/source/sales/client/widgets/chart.js index 6180e9e18..ed2035dc8 100644 --- a/enyo-client/extensions/source/sales/client/widgets/chart.js +++ b/enyo-client/extensions/source/sales/client/widgets/chart.js @@ -19,7 +19,7 @@ trailing:true, white:true*/ parameters: [{ attribute: "shipDate", operator: ">=", - value: XT.date.applyTimezoneOffset(XV.Date.prototype.textToDate("-30"), true) + value: XT.date.applyTimezoneOffset(XV.DateWidget.prototype.textToDate("-30"), true) }] }, dateField: "shipDate", @@ -40,11 +40,11 @@ trailing:true, white:true*/ parameters: [{ attribute: "orderDate", operator: ">=", - value: XT.date.applyTimezoneOffset(XV.Date.prototype.textToDate("0"), true) + value: XT.date.applyTimezoneOffset(XV.DateWidget.prototype.textToDate("0"), true) }, { attribute: "orderDate", operator: "<=", - value: XT.date.applyTimezoneOffset(XV.Date.prototype.textToDate("+30"), true) + value: XT.date.applyTimezoneOffset(XV.DateWidget.prototype.textToDate("+30"), true) }] }, dateField: "orderDate", diff --git a/lib/enyo-x/source/views/grid_box.js b/lib/enyo-x/source/views/grid_box.js index ecdd49e01..818e64a61 100644 --- a/lib/enyo-x/source/views/grid_box.js +++ b/lib/enyo-x/source/views/grid_box.js @@ -353,7 +353,7 @@ trailing:true, white:true, strict: false*/ components: [ {kind: "onyx.Button", name: "newButton", ontap: "newItem", classes: "icon-plus"}, {kind: "onyx.Button", name: "exportButton", ontap: "exportAttr", - icon: "share", content: "_export".loc(), classes: "icon-share"} + icon: "share", classes: "icon-share"} ] }); diff --git a/lib/enyo-x/source/views/list_relations_editor_box.js b/lib/enyo-x/source/views/list_relations_editor_box.js index ec885ff4d..ff258378d 100644 --- a/lib/enyo-x/source/views/list_relations_editor_box.js +++ b/lib/enyo-x/source/views/list_relations_editor_box.js @@ -98,7 +98,8 @@ trailing:true, white:true, strict: false*/ @todo Document the controlValueChanged method. */ controlValueChanged: function () { - this.$.list.refresh(); + // this is getting called before the list is created + //this.$.list.refresh(); return true; }, /** diff --git a/lib/enyo-x/source/widgets/number.js b/lib/enyo-x/source/widgets/number.js index 71dd0033a..a1a793f11 100644 --- a/lib/enyo-x/source/widgets/number.js +++ b/lib/enyo-x/source/widgets/number.js @@ -30,7 +30,7 @@ regexp:true, undef:true, trailing:true, white:true */ // use isNaN here because this value could be a number String, 0 value, or null // only want to set value as null in cases of bad strings and null/undefined value = value !== null && !isNaN(value) ? XT.math.round(value, this.getScale()) : null; - XV.InputWidget.prototype.setValue.call(this, value, options); + this.inherited(arguments); }, /** Determines whether the user input is numeric. @@ -61,7 +61,7 @@ regexp:true, undef:true, trailing:true, white:true */ } else { value = ""; } - return XV.InputWidget.prototype.valueChanged.call(this, value); + this.inherited(arguments); } }); diff --git a/lib/enyo-x/source/widgets/relation.js b/lib/enyo-x/source/widgets/relation.js index dba67a40b..3783b06a7 100644 --- a/lib/enyo-x/source/widgets/relation.js +++ b/lib/enyo-x/source/widgets/relation.js @@ -160,9 +160,10 @@ regexp:true, undef:true, trailing:true, white:true, strict:false */ this.$.newItem.setDisabled(_couldNotCreate.apply(this) || disabled); this.$.label.addRemoveClass("disabled", disabled); - _.each(this.$.descriptionContainer.$, function (component) { - component.addRemoveClass("disabled", disabled); - }, this); + // _.each(this.$.descriptionContainer.$, function (component) { + // component.addRemoveClass("disabled", disabled); + // }, this); + this.$.descriptionContainer.addRemoveClass('disabled', disabled); }, /** Query the database. diff --git a/test/database/gotchas.js b/test/database/gotchas.js index b80e286bc..45cd47e71 100644 --- a/test/database/gotchas.js +++ b/test/database/gotchas.js @@ -62,5 +62,3 @@ var _ = require("underscore"), }); }()); - -