-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
www-data
committed
Nov 7, 2011
1 parent
41b2954
commit 6256522
Showing
1 changed file
with
45 additions
and
0 deletions.
There are no files selected for viewing
45 changes: 45 additions & 0 deletions
45
contacts/contacts-sync-fix-for-google-contacts---alternative.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
diff --git a/usr/palm/services/com.palm.service.contacts.google/javascript/google_contact_handler.js b/usr/palm/services/com.palm.service.contacts.google/javascript/google_contact_handler.js | ||
index 1b4db95..56b58d9 100644 | ||
--- a/usr/palm/services/com.palm.service.contacts.google/javascript/google_contact_handler.js | ||
+++ b/usr/palm/services/com.palm.service.contacts.google/javascript/google_contact_handler.js | ||
@@ -337,7 +337,26 @@ GoogleContactHandler.copyFieldsToLocal = function (remoteContact, localContact) | ||
return localContact; | ||
}; | ||
|
||
+String.prototype.rtrim = function () { | ||
+ return this.replace(/[ \t\r\n]+$/g, ""); | ||
+} | ||
+GoogleContactHandler._ltrim = function (object) { | ||
+ for (var name in object) { | ||
+ var value = object[name]; | ||
+ switch (typeof value) { | ||
+ case 'string': | ||
+ object[name] = value.rtrim(); | ||
+ break; | ||
+ | ||
+ case 'object': | ||
+ this._ltrim(object[name]); | ||
+ break; | ||
+ } | ||
+ } | ||
+} | ||
+ | ||
GoogleContactHandler.copyFieldsToRemote = function (localContact, remoteContact) { | ||
+ this._ltrim(localContact); | ||
GoogleContactHandler._copyNameToRemote(localContact, remoteContact); | ||
|
||
GoogleContactHandler._copyNicknameToRemote(localContact, remoteContact); | ||
diff --git a/usr/palm/services/com.palm.service.contacts.google/javascript/utils/xhr.js b/usr/palm/services/com.palm.service.contacts.google/javascript/utils/xhr.js | ||
index 2f3ad39..959c765 100644 | ||
--- a/usr/palm/services/com.palm.service.contacts.google/javascript/utils/xhr.js | ||
+++ b/usr/palm/services/com.palm.service.contacts.google/javascript/utils/xhr.js | ||
@@ -41,6 +41,9 @@ var XMLHttpRequest = Class.create({ | ||
|
||
setRequestHeader: function (name, value) { | ||
Utils.debug("\n\n\n--->>> new request header. name: ", name, " value: ", value, " \n\n"); | ||
+ if (name == "Content-Length") { | ||
+ return; | ||
+ } | ||
this.options.headers[name] = value; | ||
}, | ||
|