You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ko...@apache.org on 2014/08/20 13:42:30 UTC
[3/3] git commit: [OLINGO-407] fix tester.html (minimal to full) now
again working
[OLINGO-407] fix tester.html (minimal to full) now again working
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/commit/caa44a31
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/caa44a31
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/caa44a31
Branch: refs/heads/master
Commit: caa44a31a099c7ea5449befc75408354733694e6
Parents: 1a681e8
Author: Sven Kobler <sv...@sap.com>
Authored: Wed Aug 20 13:40:57 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Wed Aug 20 13:40:57 2014 +0200
----------------------------------------------------------------------
datajs/demo/tester.html | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/caa44a31/datajs/demo/tester.html
----------------------------------------------------------------------
diff --git a/datajs/demo/tester.html b/datajs/demo/tester.html
index bd4e513..929c6fd 100644
--- a/datajs/demo/tester.html
+++ b/datajs/demo/tester.html
@@ -27,7 +27,7 @@
.code .comment,.code .ns{color:#666666;}
.left {
- left : 20px;
+ margin-left : 20px;
position:relative;
}
@@ -97,15 +97,14 @@
// Testing
function buttonClick(configNr) {
var metadata = $("input[name*='inMetadata']:checked").val();
- var recognizeDates = $("#inRecognizeDates:checked").val();
+ var recognizeDates = ($("#inRecognizeDates:checked").val() ==='on') ? true : false;
+ var inMinimalToFull = ($("#inMinimalToFull:checked").val() ==='on') ? true : false;
var requestUri = {
requestUri : config[configNr].url
};
- if (recognizeDates==='on') {
- requestUri.recognizeDates = true;
- }
+ requestUri.recognizeDates = recognizeDates;
var metaDatasuccess = function(metadata){
odatajs.oData.read(requestUri, success, errorFunc, null, null, metadata);
@@ -116,7 +115,11 @@
odatajs.oData.read(requestUri, success, errorFunc);
} else if ( metadata === 'minimal') {
requestUri.headers = { Accept : 'application/json;odata.metadata=minimal' };
- getMetaData(metaDatasuccess);
+ if (inMinimalToFull) {
+ getMetaData(metaDatasuccess);
+ } else {
+ odatajs.oData.read(requestUri, success, errorFunc);
+ }
} else {
requestUri.headers = { Accept : 'application/json;odata.metadata=none' };
odatajs.oData.read(requestUri, success, errorFunc);