Repository: oozie Updated Branches: refs/heads/master 4b130213b -> b06abd140
OOZIE-1712 Oozie page does not render in Internet Explorer 9 on Windows (omaliuvanchuk via rohini) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b06abd14 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b06abd14 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b06abd14 Branch: refs/heads/master Commit: b06abd140f718404168c81c6f73ebcb3d30c37fb Parents: 4b13021 Author: Rohini Palaniswamy <[email protected]> Authored: Mon Mar 17 13:12:49 2014 -0700 Committer: Rohini Palaniswamy <[email protected]> Committed: Mon Mar 17 13:12:49 2014 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + .../src/main/webapp/console/sla/js/oozie-sla.js | 4 +-- webapp/src/main/webapp/oozie-console.js | 28 ++++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b06abd14/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 1c4ded0..0d131e3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1712 Oozie page does not render in Internet Explorer 9 on Windows (omaliuvanchuk via rohini) OOZIE-1720 Oozie Hive action doesn't honour mapred.job.name (mithun via rohini) OOZIE-1543 Minor typo in Hive Action documentation (anbu78 via rkanter) OOZIE-1650 Whitelisting docs are incorrect (anbu78 via rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/b06abd14/webapp/src/main/webapp/console/sla/js/oozie-sla.js ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/console/sla/js/oozie-sla.js b/webapp/src/main/webapp/console/sla/js/oozie-sla.js index feaa3b2..2ecad22 100644 --- a/webapp/src/main/webapp/console/sla/js/oozie-sla.js +++ b/webapp/src/main/webapp/console/sla/js/oozie-sla.js @@ -18,11 +18,11 @@ function initializeDatePicker() { $("#startDate").datetimepicker({ - dateFormat: 'yy-mm-dd', + dateFormat: 'yy-mm-dd' }); $("#endDate").datetimepicker({ - dateFormat: 'yy-mm-dd', + dateFormat: 'yy-mm-dd' }); } http://git-wip-us.apache.org/repos/asf/oozie/blob/b06abd14/webapp/src/main/webapp/oozie-console.js ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/oozie-console.js b/webapp/src/main/webapp/oozie-console.js index 0b6cedf..b1cd612 100644 --- a/webapp/src/main/webapp/oozie-console.js +++ b/webapp/src/main/webapp/oozie-console.js @@ -294,7 +294,7 @@ Ext.ux.Image = Ext.extend(Ext.BoxComponent, { autoEl: { tag: 'img', - src: Ext.BLANK_IMAGE_URL, + src: Ext.BLANK_IMAGE_URL }, initComponent: function() { @@ -448,7 +448,7 @@ function jobDetailsPopup(response, request) { name: 'endTime', width: 400, value: jobDetails["endTime"] - }, ] + } ] }); var fs = new Ext.FormPanel({ frame: true, @@ -512,7 +512,7 @@ function jobDetailsPopup(response, request) { width: 170, sortable: true, dataIndex: 'endTime' - }, ], + } ], stripeRows: true, // autoHeight: true, autoScroll: true, @@ -785,7 +785,7 @@ function jobDetailsPopup(response, request) { title: 'Job DAG', items: imageContainer, tbar: [{ - text: " ", + text: " " // To avoid OOM /*icon: 'ext-2.2/resources/images/default/grid/refresh.gif', handler: function() { @@ -990,7 +990,7 @@ function coordJobDetailsPopup(response, request) { name: 'concurrency', width: 200, value: jobDetails["concurrency"] - }, ] + } ] }); var fs = new Ext.FormPanel({ frame: true, @@ -1054,7 +1054,7 @@ function coordJobDetailsPopup(response, request) { width: 170, sortable: true, dataIndex: 'LastModifiedTime' - }, ], + } ], stripeRows: true, // autoHeight: true, autoScroll: true, @@ -1157,7 +1157,7 @@ function coordJobDetailsPopup(response, request) { width: 400, value: actionStatus["trackerUri"] - }, ] + } ] }); /* var detail = new Ext.FormPanel( { @@ -1314,7 +1314,7 @@ function bundleJobDetailsPopup(response, request) { name: 'group', width: 170, value: jobDetails["group"] - }, ] + } ] }); var fs = new Ext.FormPanel({ @@ -1396,7 +1396,7 @@ function bundleJobDetailsPopup(response, request) { width: 200, sortable: true, dataIndex: 'nextMaterializedTime' - }, ], + } ], stripeRows: true, // autoHeight: true, autoScroll: true, @@ -1560,7 +1560,7 @@ function showConfigurationInWindow(dataObject, windowTitle) { width: 240, sortable: true, dataIndex: 'value' - }, ], + } ], stripeRows: true, autoHeight: true, autoScroll: true, @@ -2132,7 +2132,7 @@ function initConsole() { width: 170, sortable: true, dataIndex: 'endTime' - }, ], + } ], stripeRows: true, autoScroll: true, @@ -2179,7 +2179,7 @@ function initConsole() { sortable: true, renderer: valueRenderer, dataIndex: 'value' - }, ], + } ], height: 500, width: 1040, autoScroll: true, @@ -2265,7 +2265,7 @@ function initConsole() { width: 170, sortable: true, dataIndex: 'nextMaterializedTime' - },], + }], stripeRows: true, autoScroll: true, @@ -2336,7 +2336,7 @@ function initConsole() { width: 170, sortable: true, dataIndex: 'createdTime' - },], + }], stripeRows: true, autoScroll: true,
