Skip to content
Browse files

Merge pull request #462 from tricknotes/fix-typo-in-code-comment

Fix typo in code comment
  • Loading branch information...
2 parents c32ebbb + 6fd3a74 commit a74d519cb6cd05e86e719c9c2b4154974e2890f5 @assaf committed
Showing with 16 additions and 11 deletions.
  1. +10 −5 lib/zombie/eventloop.coffee
  2. +5 −5 lib/zombie/scripts.coffee
  3. +1 −1 lib/zombie/window.coffee
View
15 lib/zombie/eventloop.coffee
@@ -286,11 +286,16 @@ class EventQueue
# Makes an HTTP request.
#
# Parameters are:
- # url - URL (string)
- # method - Method (defaults to GET)
- # headers - Headers to pass in request
- # body - Document body
- # target - Document or element being loaded
+ # method - Method (defaults to GET)
+ # url - URL (string)
+ # options - See below
+ # callback - Called with error, or null and response
+ #
+ # Options:
+ # headers - Name/value pairs of headers to send in request
+ # params - Parameters to pass in query string or document body
+ # body - Request document body
+ # timeout - Request timeout in milliseconds (0 or null for no timeout)
#
# Calls callback with response error or null and response object.
http: (method, url, options, callback)->
View
10 lib/zombie/scripts.coffee
@@ -123,11 +123,11 @@ HTML.Element.prototype.setAttribute = (name, value)->
# -- Utility methods --
# Triggers an error event on the specified element. Accepts:
-# element - Element/document associated wit this error
-# skip - Filename of the caller (__filename), we use this to trim the stack trace
-# scope - Execution scope, e.g. "XHR", "Timeout"
-# error - Actual Error object
-raise = ({ element, location, from, scope, error })->
+# element - Element/document associated with this error
+# location - Location of this error
+# scope - Execution scope, e.g. "XHR", "Timeout"
+# error - Actual Error object
+raise = ({ element, location, scope, error })->
document = element.ownerDocument || element
window = document.parentWindow
message = if scope then "#{scope}: #{error.message}" else error.message
View
2 lib/zombie/window.coffee
@@ -20,7 +20,7 @@ inContext = null
#
# Parameters
# browser - Browser that owns this window
-# param - Data to submit (used by forms)
+# params - Data to submit (used by forms)
# encoding - Encoding MIME type (used by forms)
# history - This window shares history with other windows
# method - HTTP method (used by forms)

0 comments on commit a74d519

Please sign in to comment.
Something went wrong with that request. Please try again.