Skip to content

Commit 97d55a9

Browse files
committed
Merge pull request #7 from joscha/patch-1
Fix typo & restore old ns
2 parents 837bc3b + 999142d commit 97d55a9

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/please.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,9 +606,14 @@ please.Request = Request;
606606
please.Response = Response;
607607
please.UnserializableResponseData = UnserializableResponseData;
608608

609-
// returns please and removes the reference from window.
610-
please.noConfict = function () {
611-
delete window.please;
609+
// returns please and removes the reference from window or restores it.
610+
var oldPlease = window.please;
611+
please.noConflict = function () {
612+
if (typeof oldPlease !== 'undefined') {
613+
window.please = oldPlease;
614+
} else {
615+
delete window.please;
616+
}
612617
return please;
613618
};
614619

0 commit comments

Comments
 (0)