Repository: olingo-odata4-js Updated Branches: refs/heads/OLINGO-324 c2c191369 -> 43c8c1565
[OLINGO-324] remove dependencies in demo 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/43c8c156 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/43c8c156 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/43c8c156 Branch: refs/heads/OLINGO-324 Commit: 43c8c15650d93e44796b22a52d81b11e82b29070 Parents: c2c1913 Author: Sven Kobler <[email protected]> Authored: Fri Jun 13 10:39:11 2014 +0200 Committer: Sven Kobler <[email protected]> Committed: Fri Jun 13 10:39:11 2014 +0200 ---------------------------------------------------------------------- datajs/demo/mypage.html | 6 ++-- datajs/demo/tester.html | 51 +++++++++++++++++++++------------ datajs/demo/testerV2.html | 46 ++++++++++++++++++----------- datajs/src/lib/odata/json-light.js | 2 +- 4 files changed, 66 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/43c8c156/datajs/demo/mypage.html ---------------------------------------------------------------------- diff --git a/datajs/demo/mypage.html b/datajs/demo/mypage.html index 1243b99..8624dce 100644 --- a/datajs/demo/mypage.html +++ b/datajs/demo/mypage.html @@ -2,9 +2,9 @@ <html xmlns="http://www.w3.org/1999/xhtml";> <head> <title>data js demo</title> - <script type="text/javascript" src="Scripts/datajs-1.1.1.js"></script> - <script type="text/javascript" src="Scripts/jquery-2.0.3.js"></script> - <script type="text/javascript" src="Scripts/datajs_demo.js"></script> + <script type="text/javascript" src="scripts/datajs-1.1.1.js"></script> + <script type="text/javascript" src="scripts/jquery-2.0.3.js"></script> + <script type="text/javascript" src="scripts/datajs_demo.js"></script> <style type="text/css">.title { font-size: 30px;font-style: italic;}</style> </head> <body onload="run()"> http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/43c8c156/datajs/demo/tester.html ---------------------------------------------------------------------- diff --git a/datajs/demo/tester.html b/datajs/demo/tester.html index 011bf90..49f9843 100644 --- a/datajs/demo/tester.html +++ b/datajs/demo/tester.html @@ -2,38 +2,51 @@ <head> <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> <title>datajs startup perf test</title> - <script type="text/javascript" src="./jscripts/jquery-1.11.1.min.js"></script> - <script type="text/javascript" src="./jscripts/underscore-min.js" ></script> - <script type="text/javascript" src="./jscripts/backbone-min.js" ></script> - <script type="text/javascript" src="./jscripts/datajs-2.0.0.js"></script> - <!--https://github.com/warfares/pretty-json/blob/master/index.html--> - <script type="text/javascript" src="./jscripts/pretty-json-min.js" ></script> - + <script type="text/javascript" src="./scripts/jquery-1.11.1.min.js"></script> + <script type="text/javascript" src="./scripts/datajs-2.0.0.js"></script> + <script type="text/javascript" src="./scripts/tools.js" ></script> + <style type="text/css"> + .code{font-family:"Courier New",monospace;font-size:13px;line-height:18px;} + .code ul{list-style:none;margin:0 0 0 1.5em;padding:0;} + .code li{position:relative;} + .code.json li:after{content:',';} + .code.json li:last-child:after{content:'';} + .code span{white-space:nowrap;padding:2px 1px;} + .code .property{font-weight:bold;color:#000000;} + .code .null{color:#9d261d;} + .code .boolean{color:#760a85;} + .code .numeric{color:#0076cb;} + .code .string{color:#247230;} + .code .deffered{color:#666666;font-size:0.9em;} + .code .toggle{position:absolute;left:-1em;cursor:pointer;} + .code .tag{color:#003283;} + .code .atn{color:#760a85;} + .code .atv{color:#247230;} + .code .text{color:#000000;} + .code .cdata{color:#008080;} + .code .comment,.code .ns{color:#666666;} + </style> </head> <body> <button id="startXML">XML</button><br/> <button id="startJSON">JSON</button><br/> <button id="btnMetaData">MetaData</button><br/> <button id="btnJSONwithMetaData">JSON with MetaData</button><br/> - <div id='resultsArea'> - - </div> + <code id='resultsArea' data-type="json"> + </code> <script type='text/html' id='template'> {{#items}} <p><a href="{{id}}">{{name}}</a></p> {{/items}} </script> <script> - function success(data) { + function show(data) { $('#resultsArea').empty(); - //$('#resultsArea').html(Mustache.render($('#template').html(), {items:data})); - //var out = JSON.stringify(data, null, 4) - //$('#resultsArea').html(out); - var node = new PrettyJSON.view.Node({ - el:$('#resultsArea'), - data: data, - }); - node.expandAll(); + $('#resultsArea').text(JSON.stringify(data)) + $('code[data-type]').prettify(); + } + function success(data) { + show(data); } function errorFunc(err) { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/43c8c156/datajs/demo/testerV2.html ---------------------------------------------------------------------- diff --git a/datajs/demo/testerV2.html b/datajs/demo/testerV2.html index e21e364..792e240 100644 --- a/datajs/demo/testerV2.html +++ b/datajs/demo/testerV2.html @@ -2,13 +2,30 @@ <head> <meta http-equiv="X-UA-Compatible" content="IE=Edge" /> <title>datajs startup perf test</title> - <script type="text/javascript" src="./jscripts/jquery-1.11.1.min.js"></script> - <script type="text/javascript" src="./jscripts/underscore-min.js" ></script> - <script type="text/javascript" src="./jscripts/backbone-min.js" ></script> - <script type="text/javascript" src="./jscripts/datajs-1.1.2.js"></script> - <!--https://github.com/warfares/pretty-json/blob/master/index.html--> - <script type="text/javascript" src="./jscripts/pretty-json-min.js" ></script> - + <script type="text/javascript" src="./scripts/jquery-1.11.1.min.js"></script> + <script type="text/javascript" src="./scripts/datajs-2.0.0.js"></script> + <script type="text/javascript" src="./scripts/tools.js" ></script> + <style type="text/css"> + .code{font-family:"Courier New",monospace;font-size:13px;line-height:18px;} + .code ul{list-style:none;margin:0 0 0 1.5em;padding:0;} + .code li{position:relative;} + .code.json li:after{content:',';} + .code.json li:last-child:after{content:'';} + .code span{white-space:nowrap;padding:2px 1px;} + .code .property{font-weight:bold;color:#000000;} + .code .null{color:#9d261d;} + .code .boolean{color:#760a85;} + .code .numeric{color:#0076cb;} + .code .string{color:#247230;} + .code .deffered{color:#666666;font-size:0.9em;} + .code .toggle{position:absolute;left:-1em;cursor:pointer;} + .code .tag{color:#003283;} + .code .atn{color:#760a85;} + .code .atv{color:#247230;} + .code .text{color:#000000;} + .code .cdata{color:#008080;} + .code .comment,.code .ns{color:#666666;} + </style> </head> <body> <button id="startXML">startXML</button><br/> @@ -22,16 +39,13 @@ {{/items}} </script> <script> - function success(data) { + function show(data) { $('#resultsArea').empty(); - //$('#resultsArea').html(Mustache.render($('#template').html(), {items:data})); - //var out = JSON.stringify(data, null, 4) - //$('#resultsArea').html(out); - var node = new PrettyJSON.view.Node({ - el:$('#resultsArea'), - data: data, - }); - node.expandAll(); + $('#resultsArea').text(JSON.stringify(data)) + $('code[data-type]').prettify(); + } + function success(data) { + show(data); } function errorFunc(err) { http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/43c8c156/datajs/src/lib/odata/json-light.js ---------------------------------------------------------------------- diff --git a/datajs/src/lib/odata/json-light.js b/datajs/src/lib/odata/json-light.js index 3e97c56..1450c23 100644 --- a/datajs/src/lib/odata/json-light.js +++ b/datajs/src/lib/odata/json-light.js @@ -665,7 +665,7 @@ var jsonLightReadFeed = function (data, feedInfo, baseURI, model, recognizeDates /// <param name="model" type="Object" optional="true">Object describing an OData conceptual schema.</param> /// <param name="recognizeDates" type="Boolean" optional="true">Flag indicating whether datetime literal strings should be converted to JavaScript Date objects.</param> /// <returns type="Object">Feed or top level collection object.</param> - + /**/ var items = isArray(data) ? data : data.value; var entries = []; var i, len, entry;
