Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ecommerce-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
ecommerce-ui
Commits
682b3a8e
Commit
682b3a8e
authored
Jul 25, 2013
by
Sven Franck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
JQM-hack: allow same page transition with search parameters while not available
parent
cbe324f1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
8 deletions
+10
-8
js/libs/jquery-mobile/jquery-mobile.js
js/libs/jquery-mobile/jquery-mobile.js
+10
-8
No files found.
js/libs/jquery-mobile/jquery-mobile.js
View file @
682b3a8e
...
...
@@ -4742,7 +4742,7 @@ $.widget( "mobile.page", {
// if it is the first page, allow to override query parameters
// TODO: calling isFirstPageUrl a lot here.
if
(
content
.
length
===
1
&&
if
(
content
.
length
>
0
&&
path
.
isFirstPageUrl
(
fileUrl
)
)
{
settings
.
isFirst
=
true
;
}
...
...
@@ -5279,9 +5279,7 @@ $.widget( "mobile.page", {
var
u
=
path
.
parseUrl
(
path
.
makeUrlAbsolute
(
url
,
this
.
documentBase
)
),
// Does the url have the same path as the document?
samePath
=
u
.
hrefNoHash
===
this
.
documentUrl
.
hrefNoHash
||
u
.
hrefNoSearch
===
this
.
documentUrl
.
hrefNoSearch
||
(
this
.
documentBaseDiffers
&&
u
.
hrefNoHash
===
this
.
documentBase
.
hrefNoHash
),
samePath
=
u
.
hrefNoSearch
===
this
.
documentUrl
.
hrefNoSearch
||
(
this
.
documentBaseDiffers
&&
u
.
hrefNoHash
===
this
.
documentBase
.
hrefNoHash
),
// Get the first page element.
fp
=
$
.
mobile
.
firstPage
,
...
...
@@ -5849,9 +5847,13 @@ $.widget( "mobile.page", {
});
},
cleanFrom
:
function
()
{
isSame
:
function
()
{
return
this
.
$to
[
0
]
===
this
.
$from
[
0
];
},
cleanFrom
:
function
(
keepActive
)
{
this
.
$from
.
removeClass
(
$
.
mobile
.
activePageClass
+
"
out in reverse
"
+
this
.
name
)
.
removeClass
(
(
keepActive
?
""
:
$
.
mobile
.
activePageClass
)
+
"
out in reverse
"
+
this
.
name
)
.
height
(
""
);
},
...
...
@@ -5984,7 +5986,7 @@ $.widget( "mobile.page", {
beforeDoneOut
:
function
()
{
if
(
this
.
$from
)
{
this
.
cleanFrom
();
this
.
cleanFrom
(
this
.
isSame
);
}
},
...
...
@@ -6009,7 +6011,7 @@ $.widget( "mobile.page", {
beforeDoneIn
:
function
()
{
if
(
this
.
$from
)
{
this
.
cleanFrom
();
this
.
cleanFrom
(
this
.
isSame
);
}
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment