From 4928f3c672f2b0dd0579a6a6982be5fe55177d87 Mon Sep 17 00:00:00 2001
From: Anne-Gaelle Colom
Date: Sun, 23 Mar 2014 21:16:55 +0000
Subject: [PATCH 1/8] Navigate: Fixed error in warning text
Fixes gh-289
Closes gh-290
---
entries/jQuery.mobile.navigate.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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.
From af3a89b7c099de7251935a0213809f9f35661706 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz
Date: Thu, 10 Apr 2014 13:56:23 -0400
Subject: [PATCH 2/8] Pagecontainer: Update events and deprecations for 1.4.3
Closes gh-297
---
entries/pagebeforechange.xml | 7 +-
entries/pagebeforecreate.xml | 14 +---
entries/pagebeforehide.xml | 2 +-
entries/pagechange.xml | 28 +++----
entries/pagecontainer.xml | 109 ++++++++++++++++++++++++-
entries/pageremove.xml | 4 +-
includes/pageevent-deprecation-1-6.xml | 5 ++
includes/pageevent-deprecation.xml | 2 +-
8 files changed, 136 insertions(+), 35 deletions(-)
create mode 100644 includes/pageevent-deprecation-1-6.xml
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 @@
-
+pagebeforechangeTriggered 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 @@
pagebeforecreateTriggered 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 @@
-
+pagebeforehideTriggered 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 @@
-
+pagechangeThis 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:
Styling panels
-
By default, panels have very simple styles to let you customize them as needed. Panels are essentially just simple blocks with no margins that sit on either side of the page content. The framework wraps the panel content in a div with class ui-pannel-inner which has a padding of 15 pixels. If needed you can override this with custom CSS or use option classes.panelInner to set a different class name for the div.
+
By default, panels have very simple styles to let you customize them as needed. Panels are essentially just simple blocks with no margins that sit on either side of the page content. The framework wraps the panel content in a div with class ui-panel-inner which has a padding of 15 pixels. If needed you can override this with custom CSS or use option classes.panelInner to set a different class name for the div.
Panels have a fixed width of 17em (272 pixels) which is narrow enough to still show some of the page contents when open to make clicking out to close easy, and still looks good on wider tablet or desktop screens. The styles to set widths on panels are fairly complex but these can be overridden with CSS as needed.
-
Note that adding padding, borders, or margins directly to the panel container will alter the overall dimensions and could cause the positioning and animation to be affected. To avoid this, apply styles to the panel content wrapper (.ui-pannel-inner).
+
Note that adding padding, borders, or margins directly to the panel container will alter the overall dimensions and could cause the positioning and animation to be affected. To avoid this, apply styles to the panel content wrapper (.ui-panel-inner).
Other than the theme background, width and 100% height styles, panels have very little styling on their own. The default theme for panels is "a". You can set a different theme for the panel by adding a data-theme to the panel container, or set data-theme="none" and add your own classes to style it as needed.
From b59d1ff22dba0672fd771843a50911aa13ca2e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?=
Date: Tue, 27 May 2014 14:17:42 -0400
Subject: [PATCH 4/8] Build: Update license
Closes gh-309
---
LICENSE-MIT.txt => LICENSE.txt | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
rename LICENSE-MIT.txt => LICENSE.txt (62%)
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.
From 2fdb1b2c25ec3fc00e202e9bd6f8cc585d1f90b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?=
Date: Tue, 19 Aug 2014 16:37:04 -0400
Subject: [PATCH 5/8] Build: Upgrade to grunt-jquery-content 0.12.0
(cherry picked from commit 62861cec1cd731de9f24f15a0e214131a7fb1b89)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 56d1b422..0c5bd59e 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"grunt": "0.3.17",
"grunt-clean": "0.3.0",
"grunt-wordpress": "1.0.7",
- "grunt-jquery-content": "0.11.0",
+ "grunt-jquery-content": "0.12.0",
"grunt-check-modules": "0.1.0",
"grunt-contrib-watch": "0.1.4"
},
From aafe0acac37afb06a5460ba336a5c3ab0c34bb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?=
Date: Sat, 13 Sep 2014 16:18:23 -0500
Subject: [PATCH 6/8] Build: Upgrade to grunt-wordpress 1.1.0 and
grunt-jquery-content 0.12.1
(cherry picked from commit cfb281e6eac9eaea50f9076df1a42edf962de48b)
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 0c5bd59e..b2beca72 100644
--- a/package.json
+++ b/package.json
@@ -21,8 +21,8 @@
"dependencies": {
"grunt": "0.3.17",
"grunt-clean": "0.3.0",
- "grunt-wordpress": "1.0.7",
- "grunt-jquery-content": "0.12.0",
+ "grunt-wordpress": "1.1.0",
+ "grunt-jquery-content": "0.12.1",
"grunt-check-modules": "0.1.0",
"grunt-contrib-watch": "0.1.4"
},
From 755142670bc7162227e963877c4b4dbfe9cf83cc Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof
Date: Thu, 1 Oct 2015 21:41:32 +0300
Subject: [PATCH 7/8] Resources: Fix injection problem
Fixes gh-384
(cherry picked from commit f78d9e3e503a8f5ecd99bdb22b008c4457862a7a)
---
resources/results.php | 29 -----------------------------
1 file changed, 29 deletions(-)
delete mode 100644 resources/results.php
diff --git a/resources/results.php b/resources/results.php
deleted file mode 100644
index 7d34a0eb..00000000
--- a/resources/results.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Page Title
-
-
-
-
-
-
-
-
-
-