You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/10/28 14:16:01 UTC
svn commit: r1028272 - in /ofbiz/branches/jquery:
applications/accounting/webapp/accounting/images/
applications/accounting/webapp/ar/invoice/
applications/accounting/webapp/ar/payment/ framework/images/webapp/images/
framework/testtools/webapp/testtoo...
Author: jleroux
Date: Thu Oct 28 12:16:01 2010
New Revision: 1028272
URL: http://svn.apache.org/viewvc?rev=1028272&view=rev
Log:
A patch from Sascha Rodekamp "jQuery Test and Bug fixing" (https://issues.apache.org/jira/browse/OFBIZ-4006) - OFBIZ-4006
A first patch files which solves the most minor bugs in the list.
I already just fixed the getDependentDropdownValues at r1028261
I removed a tab (and uselessly blank lines added) in costCenters.js
Modified:
ofbiz/branches/jquery/applications/accounting/webapp/accounting/images/costCenters.js
ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl
ofbiz/branches/jquery/framework/images/webapp/images/selectall.js
ofbiz/branches/jquery/framework/testtools/webapp/testtools/SeleniumTest.ftl
ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/branches/jquery/applications/accounting/webapp/accounting/images/costCenters.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/accounting/images/costCenters.js?rev=1028272&r1=1028271&r2=1028272&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/accounting/images/costCenters.js (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/accounting/images/costCenters.js Thu Oct 28 12:16:01 2010
@@ -20,14 +20,15 @@
jQuery(document).ready( function() {
jQuery('#costCentersSubmit').click(processCostCenterData);
// Find all text boxes in form and add a method to list on for on change.
- var categoryShareInputs = jQuery('#costCenters :input:text');
+ var categoryShareInputs = jQuery('#costCenters [type=text]');
+
jQuery.each(categoryShareInputs, function (element) {
jQuery(this).change( function() {
var textIdSplit = jQuery(this).attr('id').split('|');
var tableRowId = 'row_' + textIdSplit[0];
var tableRow = jQuery("#" + tableRowId);
// get all text inputs
- var rowInputs = jQuery("#" + tableRowId + " :input:text");
+ var rowInputs = jQuery("#" + tableRowId + " [type=text]");
var totalPercentage = 0;
jQuery.each( rowInputs, function (inputElement) {
var inputElementIdSplit = jQuery(this).attr('id').split("|");
@@ -63,7 +64,6 @@ function processCostCenterData() {
data: jQuery("#costCenters").serialize(),
async: false,
type: 'POST',
- contentType: 'application/json',
success: function(data){
if (data == "") {
jQuery("#errorMessage").show();
Modified: ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=1028272&r1=1028271&r2=1028272&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Thu Oct 28 12:16:01 2010
@@ -77,7 +77,7 @@ under the License.
if ( selection.value == 'massInvoicesToApprove' || selection.value == 'massInvoicesToSent' || selection.value == 'massInvoicesToReady' || selection.value == 'massInvoicesToPaid' || selection.value == 'massInvoicesToWriteoff' || selection.value == 'massInvoicesToCancel') {
jQuery('#listInvoices').attr('action', jQuery('#invoiceStatusChange').val());
} else {
- $jQuery('#listInvoices').attr('action', selection.value);
+ jQuery('#listInvoices').attr('action', selection.value);
}
if (selection.value == 'massInvoicesToApprove') {
jQuery('#statusId').val("INVOICE_APPROVED");
Modified: ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl?rev=1028272&r1=1028271&r2=1028272&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl (original)
+++ ofbiz/branches/jquery/applications/accounting/webapp/ar/payment/batchPayments.ftl Thu Oct 28 12:16:01 2010
@@ -85,7 +85,7 @@ function setServiceName(selection) {
} else if (selection.value == 'massPaymentsToReceived') {
jQuery('#statusId').val("PMNT_RECEIVED");
}else if (selection.value == 'massPaymentsToConfirmed') {
- jQuery('#statusId').value("PMNT_CONFIRMED");
+ jQuery('#statusId').val("PMNT_CONFIRMED");
}else if (selection.value == 'massPaymentsToCancelled') {
jQuery('#statusId').val("PMNT_CANCELLED");
}else if (selection.value == 'massPaymentsToVoid') {
Modified: ofbiz/branches/jquery/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/selectall.js?rev=1028272&r1=1028271&r2=1028272&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/jquery/framework/images/webapp/images/selectall.js Thu Oct 28 12:16:01 2010
@@ -259,6 +259,10 @@ function ajaxUpdateAreas(areaCsvString)
var areaId = areaArray[i];
var target = areaArray[i + 1];
var targetParams = areaArray[i + 2];
+ // that was done by the prototype updater internally, remove the ? and the anchor flag from the parameters
+ // not nice but works
+ targetParams = targetParams.replace('#','');
+ targetParams = targetParams.replace('?','');
jQuery.ajax({
url: target,
type: "POST",
@@ -740,8 +744,8 @@ function waitSpinnerShow() {
bdy = document.body;
lookupLeft = (bdy.offsetWidth / 2) - (jSpinner.width() / 2);
- scrollOffY = document.viewport.getScrollOffsets().top;
- winHeight = document.viewport.getHeight();
+ scrollOffY = jQuery(window).scrollTop();
+ winHeight = jQuery(window).height();
lookupTop = (scrollOffY + winHeight / 2) - (jSpinner.height() / 2);
jSpinner.css("display", "block");
Modified: ofbiz/branches/jquery/framework/testtools/webapp/testtools/SeleniumTest.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/testtools/webapp/testtools/SeleniumTest.ftl?rev=1028272&r1=1028271&r2=1028272&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/testtools/webapp/testtools/SeleniumTest.ftl (original)
+++ ofbiz/branches/jquery/framework/testtools/webapp/testtools/SeleniumTest.ftl Thu Oct 28 12:16:01 2010
@@ -73,7 +73,7 @@ under the License.
startDownLoad(url);
document.getElementById('progress_bar').style.display = "";
document.getElementById('filesize').style.display = "";
- progressBar = new Control.ProgressBar('progress_bar');
+ progressBar = jQuery("#progress_bar").progressbar({value: 0});
}
function startDownLoad(url){
@@ -81,7 +81,7 @@ under the License.
url: url,
type: "POST",
beforeSend: getProgressDownloadStatus,
- complete: function(data) {document.getElementById('download').innerHTML = '${uiLabel.CommonLoading}'}
+ complete: function(data) {document.getElementById('download').innerHTML = '${uiLabelMap.CommonLoading}'}
});
}
@@ -100,9 +100,9 @@ under the License.
var loadPercent = data.loadPercent;
document.getElementById('loadpercent').innerHTML = ''+loadPercent+'%';
var contentLength = data.contentLength;
- progressBar.setProgress(loadPercent);
+ progressBar.progressbar("option", "value", loadPercent);
if(loadPercent > 99){
- document.getElementById('download').innerHTML = '${uiLabel.CommonDownloaded}';
+ document.getElementById('download').innerHTML = '${uiLabelMap.CommonDownloaded}';
timerId.stop();
}
}
Modified: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1028272&r1=1028271&r2=1028272&view=diff
==============================================================================
--- ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Thu Oct 28 12:16:01 2010
@@ -2456,7 +2456,7 @@ background-image:url(/tomahawk/images/sp
----------------------------------*/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(../images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(../images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
@@ -2867,7 +2867,7 @@ button.ui-button::-moz-focus-inner { bor
.view-calendar button {
background: url(../images/cal.png) no-repeat !important;
display: inline-block;
-border: none;
+border: none!important;
vertical-align:top;
margin-top:3px;
width:22px;