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
fbc0ea18
Commit
fbc0ea18
authored
Jul 25, 2013
by
Sven Franck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing same page transitions with ?search=parameter
parent
682b3a8e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
10 deletions
+13
-10
js/libs/jquery-mobile/jquery-mobile.js
js/libs/jquery-mobile/jquery-mobile.js
+13
-10
No files found.
js/libs/jquery-mobile/jquery-mobile.js
View file @
fbc0ea18
...
@@ -4744,7 +4744,7 @@ $.widget( "mobile.page", {
...
@@ -4744,7 +4744,7 @@ $.widget( "mobile.page", {
// TODO: calling isFirstPageUrl a lot here.
// TODO: calling isFirstPageUrl a lot here.
if
(
content
.
length
>
0
&&
if
(
content
.
length
>
0
&&
path
.
isFirstPageUrl
(
fileUrl
)
)
{
path
.
isFirstPageUrl
(
fileUrl
)
)
{
settings
.
isFirst
=
true
;
settings
.
isFirst
Page
=
true
;
}
}
// Reset base to the default document base
// Reset base to the default document base
...
@@ -4921,7 +4921,7 @@ $.widget( "mobile.page", {
...
@@ -4921,7 +4921,7 @@ $.widget( "mobile.page", {
// store the original absolute url so that it can be provided
// store the original absolute url so that it can be provided
// to events in the triggerData of the subsequent changePage call
// to events in the triggerData of the subsequent changePage call
options
.
absUrl
=
options
.
isFirst
?
url
:
triggerData
.
absUrl
;
options
.
absUrl
=
options
.
isFirst
Page
?
url
:
triggerData
.
absUrl
;
this
.
transition
(
content
,
triggerData
,
options
);
this
.
transition
(
content
,
triggerData
,
options
);
},
this
));
},
this
));
...
@@ -5047,7 +5047,7 @@ $.widget( "mobile.page", {
...
@@ -5047,7 +5047,7 @@ $.widget( "mobile.page", {
// us to avoid generating a document url with an id hash in the case where the
// us to avoid generating a document url with an id hash in the case where the
// first-page of the document has an id attribute specified.
// first-page of the document has an id attribute specified.
if
(
toPage
[
0
]
===
$
.
mobile
.
firstPage
[
0
]
&&
!
settings
.
dataUrl
)
{
if
(
toPage
[
0
]
===
$
.
mobile
.
firstPage
[
0
]
&&
!
settings
.
dataUrl
)
{
settings
.
dataUrl
=
settings
.
isFirst
?
settings
.
absUrl
:
documentUrl
.
hrefNoHash
;
settings
.
dataUrl
=
settings
.
isFirst
Page
?
settings
.
absUrl
:
documentUrl
.
hrefNoHash
;
}
}
// The caller passed us a real page DOM element. Update our
// The caller passed us a real page DOM element. Update our
...
@@ -5076,7 +5076,7 @@ $.widget( "mobile.page", {
...
@@ -5076,7 +5076,7 @@ $.widget( "mobile.page", {
// It is up to the developer that turns on the allowSamePageTransitiona option
// It is up to the developer that turns on the allowSamePageTransitiona option
// to either turn off transition animations, or make sure that an appropriate
// to either turn off transition animations, or make sure that an appropriate
// animation transition is used.
// animation transition is used.
if
(
fromPage
&&
fromPage
[
0
]
===
toPage
[
0
]
&&
!
settings
.
allowSamePageTransition
)
{
if
(
fromPage
&&
fromPage
[
0
]
===
toPage
[
0
]
&&
!
settings
.
allowSamePageTransition
&&
!
settings
.
isFirstPage
)
{
isPageTransitioning
=
false
;
isPageTransitioning
=
false
;
this
.
_triggerWithDeprecated
(
"
transition
"
,
triggerData
);
this
.
_triggerWithDeprecated
(
"
transition
"
,
triggerData
);
this
.
element
.
trigger
(
"
pagechange
"
,
triggerData
);
this
.
element
.
trigger
(
"
pagechange
"
,
triggerData
);
...
@@ -5847,13 +5847,16 @@ $.widget( "mobile.page", {
...
@@ -5847,13 +5847,16 @@ $.widget( "mobile.page", {
});
});
},
},
isSame
:
function
()
{
isSamePage
:
function
()
{
return
this
.
$to
[
0
]
===
this
.
$from
[
0
];
// not sure about comparing ids
return
this
.
$from
!==
undefined
&&
(
this
.
$to
[
0
]
===
this
.
$from
[
0
]
||
this
.
$to
.
attr
(
"
id
"
)
===
this
.
$from
.
attr
(
"
id
"
)
)
},
},
cleanFrom
:
function
(
keepActive
)
{
cleanFrom
:
function
()
{
this
.
$from
this
.
$from
.
removeClass
(
(
keepActive
?
""
:
$
.
mobile
.
activePageClass
)
+
"
out in reverse
"
+
this
.
name
)
.
removeClass
(
(
this
.
isSamePage
()
?
""
:
$
.
mobile
.
activePageClass
)
+
"
out in reverse
"
+
this
.
name
)
.
height
(
""
);
.
height
(
""
);
},
},
...
@@ -5986,7 +5989,7 @@ $.widget( "mobile.page", {
...
@@ -5986,7 +5989,7 @@ $.widget( "mobile.page", {
beforeDoneOut
:
function
()
{
beforeDoneOut
:
function
()
{
if
(
this
.
$from
)
{
if
(
this
.
$from
)
{
this
.
cleanFrom
(
this
.
isSame
);
this
.
cleanFrom
();
}
}
},
},
...
@@ -6011,7 +6014,7 @@ $.widget( "mobile.page", {
...
@@ -6011,7 +6014,7 @@ $.widget( "mobile.page", {
beforeDoneIn
:
function
()
{
beforeDoneIn
:
function
()
{
if
(
this
.
$from
)
{
if
(
this
.
$from
)
{
this
.
cleanFrom
(
this
.
isSame
);
this
.
cleanFrom
();
}
}
},
},
...
...
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