diff --git a/LICENSE-MIT.txt b/LICENSE.txt similarity index 62% rename from LICENSE-MIT.txt rename to LICENSE.txt index 8f0308b4..73c3e581 100644 --- a/LICENSE-MIT.txt +++ b/LICENSE.txt @@ -1,8 +1,14 @@ -Copyright (c) 2014 jQuery Foundation, https://jquery.org/ +Copyright 2012, 2014 jQuery Foundation and other contributors, +https://jquery.org/ This software consists of voluntary contributions made by many individuals. For exact contribution history, see the revision history -and logs, available at https://github.com/jquery/api.jquerymobile.com +available at https://github.com/jquery/api.jquerymobile.com + +The following license applies to all parts of this software except as +documented below: + +==== Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -22,3 +28,18 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +==== + +Copyright and related rights for sample code are waived via CC0. Sample +code is defined as all source code displayed within the prose of the +documentation and all examples and demos. + +CC0: http://creativecommons.org/publicdomain/zero/1.0/ + +==== + +All files located in the node_modules directory are externally +maintained libraries used by this software which have their own +licenses; we recommend you read them, as their terms may differ from the +terms above. diff --git a/entries/jQuery.mobile.navigate.xml b/entries/jQuery.mobile.navigate.xml index ded2dbdf..33657f8d 100644 --- a/entries/jQuery.mobile.navigate.xml +++ b/entries/jQuery.mobile.navigate.xml @@ -4,7 +4,7 @@ Alter the url and track history. Works for browsers with and without the new history API.

The $.mobile.navigate method provides a uniform history manipulation API for browsers that support the new history API and those that don't (hashchange). It works in concert with the navigate event by storing and retrieving arbitrary data in association with a URL (much like popState and replaceState). When the user returns to a URL set by the navigate method the navigate event is triggered with the associated data.

-

Note: This method is a low-level utility which can be used on its own. If you use the jQuery Mobile navigation framework, you should not separately use this utility. Instead, you should use pagecontainer event handlers to influence the navigation process.

+

Note: This method is a low-level utility which can be used on its own. If you use the jQuery Mobile navigation framework, you should not separately use this utility. Instead, you should use pagecontainer methods to navigate to another page.

diff --git a/entries/pagebeforechange.xml b/entries/pagebeforechange.xml index 1bc450ed..9393907e 100644 --- a/entries/pagebeforechange.xml +++ b/entries/pagebeforechange.xml @@ -1,5 +1,5 @@ - + pagebeforechange Triggered twice during the page change cyle: First prior to any page loading or transition and next after page loading completes successfully, but before the browser history has been modified by the navigation process. @@ -7,7 +7,7 @@

When received with data.toPage set to a jQuery object, the event indicates that the destination page has been loaded and navigation will continue.

During the handling of this event the browser's history has not yet changed.

In addition to the event parameter, handlers of this event will receive a second parameter, data. The second parameter is an object containing the following properties:

-
    +
    • toPage (object or string)
      • This property represents the page the caller wishes to make active. It can be either a jQuery collection object containing the page DOM element, or an absolute/relative url to an internal or external page. The value exactly matches the 1st arg to the changePage() call that triggered the event.
      • @@ -19,7 +19,8 @@
    -

    It should be noted that callbacks can modify both the toPage and options properties to alter the behavior of the current changePage() call. So for example, the toPage can be mapped to a different url from within a callback to do a sort of redirect.

    +

    It should be noted that callbacks can modify both the toPage and options properties to alter the behavior of the current changePage() call. So for example, the toPage can be mapped to a different url from within a callback to do a sort of redirect.

    + 1.0 diff --git a/entries/pagebeforecreate.xml b/entries/pagebeforecreate.xml index 5d4e6274..a3b2da0a 100644 --- a/entries/pagebeforecreate.xml +++ b/entries/pagebeforecreate.xml @@ -3,19 +3,7 @@ pagebeforecreate Triggered on the page being initialized, before most plugin auto-initialization occurs. -
    - -

    Note that by binding to pagebeforecreate, you can manipulate markup before jQuery Mobile's default widgets are auto-initialized. For example, say you want to add data attributes via JavaScript instead of in the HTML source, this is the event you'd use.

    - -
    +

    Note:This event is part of the page widget as of jQuery Mobile 1.4.0. Please consult the documentation for the page widget's implementation.

    1.0 diff --git a/entries/pagebeforehide.xml b/entries/pagebeforehide.xml index 88a30c5b..12e5631c 100644 --- a/entries/pagebeforehide.xml +++ b/entries/pagebeforehide.xml @@ -1,5 +1,5 @@ - + pagebeforehide Triggered on the "fromPage" we are transitioning away from, before the actual transition animation is kicked off. diff --git a/entries/pagechange.xml b/entries/pagechange.xml index c9bb6a03..fd9d463f 100644 --- a/entries/pagechange.xml +++ b/entries/pagechange.xml @@ -1,22 +1,22 @@ - + pagechange This event is triggered after the changePage() request has finished loading the page into the DOM and all page transition animations have completed.

    Note that any pageshow or pagehide events will have fired *BEFORE* this event is triggered. Callbacks for this particular event will be passed a data object as the 2nd arg. The properties for this object are as follows:

    -
      -
    • toPage (object or string) -
        -
      • This property represents the page the caller wishes to make active. It can be either a jQuery collection object containing the page DOM element, or an absolute/relative url to an internal or external page. The value exactly matches the 1st arg to the changePage() call that triggered the event.
      • -
      -
    • -
    • options (object) -
        -
      • This object contains the configuration options to be used for the current changePage() call.
      • -
      -
    • -
    - +
      +
    • toPage (object or string) +
        +
      • This property represents the page the caller wishes to make active. It can be either a jQuery collection object containing the page DOM element, or an absolute/relative url to an internal or external page. The value exactly matches the 1st arg to the changePage() call that triggered the event.
      • +
      +
    • +
    • options (object) +
        +
      • This object contains the configuration options to be used for the current changePage() call.
      • +
      +
    • +
    +
    1.0 diff --git a/entries/pagecontainer.xml b/entries/pagecontainer.xml index d86a4617..10f38b83 100644 --- a/entries/pagecontainer.xml +++ b/entries/pagecontainer.xml @@ -86,6 +86,25 @@ + + Triggered during the page change cyle prior to any page loading or transition. + + + + This property represents the page the caller wishes to make active. It can be either a jQuery collection object containing the page DOM element, or an absolute/relative url to an internal or external page. The value exactly matches the 1st arg to the changePage() call that triggered the event. + + + + + A jQuery collection object that contains the from page DOM element. + + + + The configuration options to be used for the current change() call + + + + Triggered before the actual transition animation is kicked off. @@ -94,6 +113,14 @@ A jQuery collection object that contains the destination page DOM element. + + A jQuery collection object that contains the destination page DOM element. + + + + A jQuery collection object that contains the from page DOM element. + + @@ -114,6 +141,14 @@ The filtered version of absUrl to be used when identifying the page and updating the browser location when the page is made active. + + A string containing the url being loaded + + + + A jQuery collection object that contains the from page DOM element. + + Deferred to be resolved or rejected upon completion of content load. Callbacks that call preventDefault() on the event MUST call resolve() or reject() on this object so that change() requests resume processing. Deferred object observers expect the deferred object to be resolved like this:
    ";
    -		?>
    -
    -	
    -
    -
    -