diff --git a/history.txt b/history.txt index da441aa..21f834c 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,4 @@ +1.10.1 Work with both 2.x and 3.x versions of Saltarelle.Web Added jQuery.Select(Element) and string as an option for Data in jQueryAjaxOptions diff --git a/jQuery/jQueryDataHttpRequest.cs b/jQuery/jQueryDataHttpRequest.cs index 421a3f6..3dd86ab 100644 --- a/jQuery/jQueryDataHttpRequest.cs +++ b/jQuery/jQueryDataHttpRequest.cs @@ -95,7 +95,8 @@ public jQueryDataHttpRequest Always(params Action[] callbacks) { /// The callbacks to invoke (in order). /// The current request object. [ExpandParams] - public jQueryDataHttpRequest Always(params Action[] callbacks) { + public jQueryDataHttpRequest Always(params AjaxCompletedCallback[] callbacks) + { return null; } @@ -104,7 +105,9 @@ public jQueryDataHttpRequest Always(params Action[] callbacks) { /// /// The callback to invoke. /// The current request object. - public jQueryDataHttpRequest Complete(AjaxCompletedCallback callback) { + [Obsolete("Deprecated since jQuery 1.8. Use Always() instead.")] + public jQueryDataHttpRequest Complete(AjaxCompletedCallback callback) + { return null; } @@ -126,7 +129,8 @@ public jQueryDataHttpRequest Done(params Action[] doneCallbacks) { /// The callbacks to invoke (in order). /// The current request object. [ExpandParams] - public jQueryDataHttpRequest Done(params Action[] doneCallbacks) { + public jQueryDataHttpRequest Done(params AjaxRequestCallback[] doneCallbacks) + { return null; } @@ -135,7 +139,9 @@ public jQueryDataHttpRequest Done(params Action[] doneCallbacks) { /// /// The callback to invoke. /// The current request object. - public jQueryDataHttpRequest Error(AjaxErrorCallback callback) { + [Obsolete("Deprecated since jQuery 1.8. Use Fail() instead.")] + public jQueryDataHttpRequest Error(AjaxErrorCallback callback) + { return null; } @@ -157,7 +163,8 @@ public jQueryDataHttpRequest Fail(params Action[] failCallbacks) { /// The callbacks to invoke (in order). /// The current request object. [ExpandParams] - public jQueryDataHttpRequest Fail(params Action[] failCallbacks) { + public jQueryDataHttpRequest Fail(params AjaxErrorCallback[] failCallbacks) + { return null; } @@ -221,7 +228,9 @@ public void SetRequestHeader(string name, string value) { /// /// The callback to invoke. /// The current request object. - public jQueryDataHttpRequest Success(AjaxCallback callback) { + [Obsolete("Deprecated since jQuery 1.8. Use Done() instead.")] + public jQueryDataHttpRequest Success(AjaxCallback callback) + { return null; } @@ -230,7 +239,9 @@ public jQueryDataHttpRequest Success(AjaxCallback callback) { /// /// The callback to invoke. /// The current request object. - public jQueryDataHttpRequest Success(AjaxRequestCallback callback) { + [Obsolete("Deprecated since jQuery 1.8. Use Done() instead.")] + public jQueryDataHttpRequest Success(AjaxRequestCallback callback) + { return null; } diff --git a/jQuery/jQueryObject.cs b/jQuery/jQueryObject.cs index a7c2bfa..11c411b 100644 --- a/jQuery/jQueryObject.cs +++ b/jQuery/jQueryObject.cs @@ -3017,8 +3017,8 @@ public jQueryObject Next([SyntaxValidation("cssSelector")] string selector) { } /// - /// Gets a jQueryObject representing all the following sibling elements - /// of the matched set of elements. + /// Gets a jQueryObject representing all following siblings + /// of each element in the set of matched elements. /// /// The new jQueryObject. public jQueryObject NextAll() { @@ -3026,8 +3026,9 @@ public jQueryObject NextAll() { } /// - /// Gets a jQueryObject representing all the following sibling elements - /// of the matched set of elements filtered by the specified selector. + /// Gets a jQueryObject representing all following siblings + /// of each element in the set of matched elements + /// filtered by the specified selector. /// /// The selector to match children against. /// The new jQueryObject. @@ -3036,12 +3037,50 @@ public jQueryObject NextAll([SyntaxValidation("cssSelector")] string selector) { } /// - /// Gets a jQueryObject representing all the following sibling elements - /// of the matched set of elements while they match the specified selector. + /// Gets a jQueryObject representing all following siblings + /// of each element up to but not including the element + /// matched by the selector. /// - /// The selector to match children against. + /// The selector to indicate where to stop matching following sibling elements. + /// The new jQueryObject. + public jQueryObject NextUntil([SyntaxValidation("cssSelector")] string selector) + { + return null; + } + + /// + /// Gets a jQueryObject representing all following siblings + /// of each element up to but not including the element + /// matched by the selector. + /// + /// The selector to indicate where to stop matching following sibling elements. + /// The selector to match elements against. + /// The new jQueryObject. + public jQueryObject NextUntil([SyntaxValidation("cssSelector")] string selector, [SyntaxValidation("cssSelector")] string filter) + { + return null; + } + + /// + /// Gets a jQueryObject representing all following siblings + /// of each element up to but not including the element. + /// + /// The selector to indicate where to stop matching following sibling elements. + /// The new jQueryObject. + public jQueryObject NextUntil(TypeOption element) + { + return null; + } + + /// + /// Gets a jQueryObject representing all following siblings + /// of each element up to but not including the element. + /// + /// The element indicating where to stop matching following sibling elements. + /// The selector to match elements against. /// The new jQueryObject. - public jQueryObject NextUntil([SyntaxValidation("cssSelector")] string selector) { + public jQueryObject NextUntil(TypeOption element, [SyntaxValidation("cssSelector")] string filter) + { return null; } @@ -3632,7 +3671,8 @@ public jQueryObject Remove([SyntaxValidation("cssSelector")] string selector) { /// /// The attribute to remove. /// The current jQueryObject. - public jQueryObject RemoveAttr(string attributeName) { + [ScriptName("removeAttr")] + public jQueryObject RemoveAttribute(string attributeName) { return null; } diff --git a/jQuery/jQueryXmlHttpRequest.cs b/jQuery/jQueryXmlHttpRequest.cs index 58dd6fb..daf308a 100644 --- a/jQuery/jQueryXmlHttpRequest.cs +++ b/jQuery/jQueryXmlHttpRequest.cs @@ -104,7 +104,9 @@ public jQueryXmlHttpRequest Always(params Callback[] callbacks) { /// /// The callback to invoke. /// The current request object. - public jQueryXmlHttpRequest Complete(AjaxCompletedCallback callback) { + [Obsolete("Deprecated since jQuery 1.8. Use Always() instead.")] + public jQueryXmlHttpRequest Complete(AjaxCompletedCallback callback) + { return null; } @@ -126,7 +128,8 @@ public jQueryXmlHttpRequest Done(params Action[] doneCallbacks) { /// The callbacks to invoke (in order). /// The current request object. [ExpandParams] - public jQueryXmlHttpRequest Done(params Callback[] doneCallbacks) { + public jQueryXmlHttpRequest Done(params AjaxRequestCallback[] doneCallbacks) + { return null; } @@ -135,6 +138,7 @@ public jQueryXmlHttpRequest Done(params Callback[] doneCallbacks) { /// /// The callback to invoke. /// The current request object. + [Obsolete("Deprecated since jQuery 1.8. Use Fail() instead.")] public jQueryXmlHttpRequest Error(AjaxErrorCallback callback) { return null; } @@ -157,7 +161,8 @@ public jQueryXmlHttpRequest Fail(params Action[] failCallbacks) { /// The callbacks to invoke (in order). /// The current request object. [ExpandParams] - public jQueryXmlHttpRequest Fail(params Callback[] failCallbacks) { + public jQueryXmlHttpRequest Fail(params AjaxErrorCallback[] failCallbacks) + { return null; } @@ -217,7 +222,9 @@ public void SetRequestHeader(string name, string value) { /// /// The callback to invoke. /// The current request object. - public jQueryXmlHttpRequest Success(AjaxCallback callback) { + [Obsolete("Deprecated since jQuery 1.8. Use Done() instead.")] + public jQueryXmlHttpRequest Success(AjaxCallback callback) + { return null; } @@ -226,7 +233,9 @@ public jQueryXmlHttpRequest Success(AjaxCallback callback) { /// /// The callback to invoke. /// The current request object. - public jQueryXmlHttpRequest Success(AjaxRequestCallback callback) { + [Obsolete("Deprecated since jQuery 1.8. Use Done() instead.")] + public jQueryXmlHttpRequest Success(AjaxRequestCallback callback) + { return null; }