Repository: olingo-odata4-js Updated Branches: refs/heads/OLINGO-238-browserify c97bb2342 -> 52c748499
[OLINGO-238] additional exports 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/52c74849 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/52c74849 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/52c74849 Branch: refs/heads/OLINGO-238-browserify Commit: 52c74849986e821e4bfd5ed40e6b889ae0185375 Parents: c97bb23 Author: Sven Kobler <sven.kobler-mor...@sap.com> Authored: Wed May 7 17:10:53 2014 +0200 Committer: Sven Kobler <sven.kobler-mor...@sap.com> Committed: Wed May 7 17:10:53 2014 +0200 ---------------------------------------------------------------------- datajs/src/lib/odata/atom.js | 1 + datajs/src/lib/odata/metadata.js | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/52c74849/datajs/src/lib/odata/atom.js ---------------------------------------------------------------------- diff --git a/datajs/src/lib/odata/atom.js b/datajs/src/lib/odata/atom.js index 1a8f01d..d47ea3f 100644 --- a/datajs/src/lib/odata/atom.js +++ b/datajs/src/lib/odata/atom.js @@ -20,6 +20,7 @@ var utils = require('./../datajs.js').utils; var xml = require('./../datajs.js').xml; +//var xml = require('./../datajs/xml.js').xml; var odataXML = require('./xml.js'); var odataUtils = require('./utils.js'); var odataHandler = require('./handler.js'); http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/52c74849/datajs/src/lib/odata/metadata.js ---------------------------------------------------------------------- diff --git a/datajs/src/lib/odata/metadata.js b/datajs/src/lib/odata/metadata.js index 59b880a..62a88fb 100644 --- a/datajs/src/lib/odata/metadata.js +++ b/datajs/src/lib/odata/metadata.js @@ -17,21 +17,22 @@ var utils = require('./../datajs.js').utils; var oDataXML = require('./xml.js'); +var oDSxml = require('./../datajs.js').xml; var odataHandler = require('./handler.js'); // imports var contains = utils.contains; var normalizeURI = utils.normalizeURI; -var xmlAttributes = utils.xmlAttributes; -var xmlChildElements = utils.xmlChildElements; -var xmlFirstChildElement = utils.xmlFirstChildElement; -var xmlInnerText = utils.xmlInnerText; -var xmlLocalName = utils.xmlLocalName; -var xmlNamespaceURI = utils.xmlNamespaceURI; -var xmlNS = utils.xmlNS; -var xmlnsNS = utils.xmlnsNS; -var xmlParse = utils.xmlParse; +var xmlAttributes = oDSxml.xmlAttributes; +var xmlChildElements = oDSxml.xmlChildElements; +var xmlFirstChildElement = oDSxml.xmlFirstChildElement; +var xmlInnerText = oDSxml.xmlInnerText; +var xmlLocalName = oDSxml.xmlLocalName; +var xmlNamespaceURI = oDSxml.xmlNamespaceURI; +var xmlNS = oDSxml.xmlNS; +var xmlnsNS = oDSxml.xmlnsNS; +var xmlParse = oDSxml.xmlParse; var createAttributeExtension = oDataXML.createAttributeExtension; var createElementExtension = oDataXML.createElementExtension;