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/04/25 14:46:32 UTC
git commit: [OLINGO-238] fix dispatchHandler undefined
Repository: olingo-odata4-js
Updated Branches:
refs/heads/OLINGO-238-browserify 23885b2cc -> 89bb04f40
[OLINGO-238] fix dispatchHandler undefined
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/89bb04f4
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/tree/89bb04f4
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/diff/89bb04f4
Branch: refs/heads/OLINGO-238-browserify
Commit: 89bb04f407ffd5fc243472bf8c006e49f77127af
Parents: 23885b2
Author: Sven Kobler <sv...@sap.com>
Authored: Fri Apr 25 14:45:03 2014 +0200
Committer: Sven Kobler <sv...@sap.com>
Committed: Fri Apr 25 14:45:03 2014 +0200
----------------------------------------------------------------------
datajs/src/lib/odata.js | 90 ++++++++++++++++++++++++++++++++++--
datajs/src/lib/odata/request.js | 84 ---------------------------------
2 files changed, 85 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/89bb04f4/datajs/src/lib/odata.js
----------------------------------------------------------------------
diff --git a/datajs/src/lib/odata.js b/datajs/src/lib/odata.js
index caea1fa..ed6d082 100644
--- a/datajs/src/lib/odata.js
+++ b/datajs/src/lib/odata.js
@@ -18,19 +18,20 @@
exports.utils = odataUtils = require('./odata/utils.js');
exports.handler = odataHandler = require('./odata/handler.js');
exports.metadata = odataMetadata = require('./odata/metadata.js');
-exports.net = require('./odata/net.js');
+exports.net = odataNet = require('./odata/net.js');
exports.gml = require('./odata/gml.js');
exports.jsonLight = require('./odata/json-light.js');
-exports.request = odataRequest = require('./odata/request.js');
exports.json = odataJson = require('./odata/json.js');
exports.atom = odataAtom = require('./odata/atom.js');
exports.xml = odataXml = require('./odata/xml.js');
exports.batchHandler = require('./odata/batch.js');
-// Configure the batch handler to use the default handler for the batch parts.
-exports.batchHandler.partHandler = odataRequest.defaultHandler;
+
+
+
var utils = require('./datajs/utils.js');
+var assigned = utils.assigned;
var assigned = utils.assigned;
var defined = utils.defined;
@@ -78,7 +79,7 @@ exports.read = function (urlOrRequest, success, error, handler, httpClient, meta
request = urlOrRequest;
}
- return odataRequest.request(request, success, error, handler, httpClient, metadata);
+ return exports.request(request, success, error, handler, httpClient, metadata);
};
@@ -91,3 +92,82 @@ exports.parseMetadata = function (csdlMetadataDocument) {
return metadataParser(null, csdlMetadataDocument);
};
+
+exports.defaultSuccess = function (data) {
+ /// <summary>Default success handler for OData.</summary>
+ /// <param name="data">Data to process.</param>
+
+ window.alert(window.JSON.stringify(data));
+};
+
+exports.defaultError = utils.throwErrorCallback;
+
+exports.defaultHandler = {
+ read: function (response, context) {
+ /// <summary>Reads the body of the specified response by delegating to JSON and ATOM handlers.</summary>
+ /// <param name="response">Response object.</param>
+ /// <param name="context">Operation context.</param>
+
+ if (response && assigned(response.body) && response.headers["Content-Type"]) {
+ dispatchHandler("read", response, context);
+ }
+ },
+
+ write: function (request, context) {
+ /// <summary>Write the body of the specified request by delegating to JSON and ATOM handlers.</summary>
+ /// <param name="request">Reques tobject.</param>
+ /// <param name="context">Operation context.</param>
+
+ dispatchHandler("write", request, context);
+ },
+
+ maxDataServiceVersion: odataHandler.MAX_DATA_SERVICE_VERSION,
+ accept: "application/atomsvc+xml;q=0.8, application/json;odata=fullmetadata;q=0.7, application/json;q=0.5, */*;q=0.1"
+};
+
+// Configure the batch handler to use the default handler for the batch parts.
+exports.batchHandler.partHandler = exports.defaultHandler;
+exports.defaultMetadata = [];
+
+
+exports.request = function (request, success, error, handler, httpClient, metadata) {
+ /// <summary>Sends a request containing OData payload to a server.</summary>
+ /// <param name="request" type="Object">Object that represents the request to be sent.</param>
+ /// <param name="success" type="Function" optional="true">Callback for a successful read operation.</param>
+ /// <param name="error" type="Function" optional="true">Callback for handling errors.</param>
+ /// <param name="handler" type="Object" optional="true">Handler for data serialization.</param>
+ /// <param name="httpClient" type="Object" optional="true">HTTP client layer.</param>
+ /// <param name="metadata" type="Object" optional="true">Conceptual metadata for this request.</param>
+
+ success = success || exports.defaultSuccess;
+ error = error || exports.defaultError;
+ handler = handler || exports.defaultHandler;
+ httpClient = httpClient || odataNet.defaultHttpClient;
+ metadata = metadata || exports.defaultMetadata;
+
+ // Augment the request with additional defaults.
+ request.recognizeDates = utils.defined(request.recognizeDates, odataJson.jsonHandler.recognizeDates);
+ request.callbackParameterName = utils.defined(request.callbackParameterName, odataNet.defaultHttpClient.callbackParameterName);
+ request.formatQueryString = utils.defined(request.formatQueryString, odataNet.defaultHttpClient.formatQueryString);
+ request.enableJsonpCallback = utils.defined(request.enableJsonpCallback, odataNet.defaultHttpClient.enableJsonpCallback);
+ request.useJsonLight = utils.defined(request.useJsonLight, odataJson.jsonHandler.useJsonLight);
+ request.inferJsonLightFeedAsObject = utils.defined(request.inferJsonLightFeedAsObject, odataJson.jsonHandler.inferJsonLightFeedAsObject);
+
+ // Create the base context for read/write operations, also specifying complete settings.
+ var context = {
+ metadata: metadata,
+ recognizeDates: request.recognizeDates,
+ callbackParameterName: request.callbackParameterName,
+ formatQueryString: request.formatQueryString,
+ enableJsonpCallback: request.enableJsonpCallback,
+ useJsonLight: request.useJsonLight,
+ inferJsonLightFeedAsObject: request.inferJsonLightFeedAsObject
+ };
+
+ try {
+ odataUtils.prepareRequest(request, handler, context);
+ return odataUtils.invokeRequest(request, success, error, handler, httpClient, context);
+ } catch (err) {
+ error(err);
+ }
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4-js/blob/89bb04f4/datajs/src/lib/odata/request.js
----------------------------------------------------------------------
diff --git a/datajs/src/lib/odata/request.js b/datajs/src/lib/odata/request.js
deleted file mode 100644
index 812266e..0000000
--- a/datajs/src/lib/odata/request.js
+++ /dev/null
@@ -1,84 +0,0 @@
-
-var odataJson = require('./json.js');
-var odataNet = require('./net.js');
-var odataUtils = require('./utils.js');
-var odataHandler = require('./handler.js');
-var utils = require('./../datajs.js').utils;
-var assigned = utils.assigned;
-
-exports.defaultSuccess = function (data) {
- /// <summary>Default success handler for OData.</summary>
- /// <param name="data">Data to process.</param>
-
- window.alert(window.JSON.stringify(data));
-};
-
-exports.defaultError = utils.throwErrorCallback;
-
-exports.defaultHandler = {
- read: function (response, context) {
- /// <summary>Reads the body of the specified response by delegating to JSON and ATOM handlers.</summary>
- /// <param name="response">Response object.</param>
- /// <param name="context">Operation context.</param>
-
- if (response && assigned(response.body) && response.headers["Content-Type"]) {
- dispatchHandler("read", response, context);
- }
- },
-
- write: function (request, context) {
- /// <summary>Write the body of the specified request by delegating to JSON and ATOM handlers.</summary>
- /// <param name="request">Reques tobject.</param>
- /// <param name="context">Operation context.</param>
-
- dispatchHandler("write", request, context);
- },
-
- maxDataServiceVersion: odataHandler.MAX_DATA_SERVICE_VERSION,
- accept: "application/atomsvc+xml;q=0.8, application/json;odata=fullmetadata;q=0.7, application/json;q=0.5, */*;q=0.1"
-};
-
-exports.defaultMetadata = [];
-
-
-exports.request = function (request, success, error, handler, httpClient, metadata) {
- /// <summary>Sends a request containing OData payload to a server.</summary>
- /// <param name="request" type="Object">Object that represents the request to be sent.</param>
- /// <param name="success" type="Function" optional="true">Callback for a successful read operation.</param>
- /// <param name="error" type="Function" optional="true">Callback for handling errors.</param>
- /// <param name="handler" type="Object" optional="true">Handler for data serialization.</param>
- /// <param name="httpClient" type="Object" optional="true">HTTP client layer.</param>
- /// <param name="metadata" type="Object" optional="true">Conceptual metadata for this request.</param>
-
- success = success || exports.defaultSuccess;
- error = error || exports.defaultError;
- handler = handler || exports.defaultHandler;
- httpClient = httpClient || odataNet.defaultHttpClient;
- metadata = metadata || exports.defaultMetadata;
-
- // Augment the request with additional defaults.
- request.recognizeDates = utils.defined(request.recognizeDates, odataJson.jsonHandler.recognizeDates);
- request.callbackParameterName = utils.defined(request.callbackParameterName, odataNet.defaultHttpClient.callbackParameterName);
- request.formatQueryString = utils.defined(request.formatQueryString, odataNet.defaultHttpClient.formatQueryString);
- request.enableJsonpCallback = utils.defined(request.enableJsonpCallback, odataNet.defaultHttpClient.enableJsonpCallback);
- request.useJsonLight = utils.defined(request.useJsonLight, odataJson.jsonHandler.useJsonLight);
- request.inferJsonLightFeedAsObject = utils.defined(request.inferJsonLightFeedAsObject, odataJson.jsonHandler.inferJsonLightFeedAsObject);
-
- // Create the base context for read/write operations, also specifying complete settings.
- var context = {
- metadata: metadata,
- recognizeDates: request.recognizeDates,
- callbackParameterName: request.callbackParameterName,
- formatQueryString: request.formatQueryString,
- enableJsonpCallback: request.enableJsonpCallback,
- useJsonLight: request.useJsonLight,
- inferJsonLightFeedAsObject: request.inferJsonLightFeedAsObject
- };
-
- try {
- odataUtils.prepareRequest(request, handler, context);
- return odataUtils.invokeRequest(request, success, error, handler, httpClient, context);
- } catch (err) {
- error(err);
- }
-};
\ No newline at end of file