Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
domotikad
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
domotika
domotikad
Commits
1be6d1a6
Commit
1be6d1a6
authored
Jan 22, 2014
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a bug in gui sliding panels
parent
d2f25cc7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
32 deletions
+32
-32
common.php
Web/htdocs/gui/includes/common.php
+2
-2
combined.min.js
Web/htdocs/gui/js/combined.min.js
+15
-15
domotika.js
Web/htdocs/gui/js/domotika.js
+15
-15
No files found.
Web/htdocs/gui/includes/common.php
View file @
1be6d1a6
<?
$GUIDEBUG
=
FALSE
;
//
$GUIDEBUG=TRUE;
//
$GUIDEBUG=FALSE;
$GUIDEBUG
=
TRUE
;
$BASEGUIPATH
=
str_replace
(
"/index.php"
,
""
,
$_SERVER
[
'PHP_SELF'
]);
$FSPATH
=
realpath
(
dirname
(
__FILE__
)
.
"/.."
);
...
...
Web/htdocs/gui/js/combined.min.js
View file @
1be6d1a6
...
...
@@ -283,21 +283,6 @@ window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.document
$
(
"#alertContainer"
).
fadeOut
({
duration
:
timeout
,
easing
:
'easeInQuint'
});
};
<
?
if
(
$left
||
$right
)
{
?
>
var
snapper
=
new
Snap
({
resistance
:
0
,
easing
:
'linear'
,
transitionSpeed
:
0.1
,
tapToClose
:
false
,
element
:
$
(
'#content'
)[
0
],
dragger
:
$
(
'#content'
)[
0
],
//dragger: $('[data-domotika-dragger="true"]')[0],
minDragDistance
:
20
,
slideIntent
:
30
,
touchToDrag
:
slideEnabled
});
<
?
}
?
>
<
?
if
(
$left
||
$right
)
{
?
>
function
calcSnapSize
()
...
...
@@ -315,6 +300,21 @@ window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.document
$
(
".right-drawer"
).
css
(
"width"
,
mval
)
});
var
snapper
=
new
Snap
({
resistance
:
0
,
easing
:
'linear'
,
transitionSpeed
:
0.1
,
tapToClose
:
false
,
element
:
$
(
'#content'
)[
0
],
dragger
:
$
(
'#content'
)[
0
],
//dragger: $('[data-domotika-dragger="true"]')[0],
minDragDistance
:
20
,
slideIntent
:
30
,
touchToDrag
:
slideEnabled
,
maxPosition
:
calcSnapSize
(),
minPosition
:
-
calcSnapSize
()
});
snapper
.
on
(
'animating'
,
function
(
e
)
{
var
mval
=
calcSnapSize
();
...
...
Web/htdocs/gui/js/domotika.js
View file @
1be6d1a6
...
...
@@ -210,21 +210,6 @@
$
(
"#alertContainer"
).
fadeOut
({
duration
:
timeout
,
easing
:
'easeInQuint'
});
};
<
?
if
(
$left
||
$right
)
{
?
>
var
snapper
=
new
Snap
({
resistance
:
0
,
easing
:
'linear'
,
transitionSpeed
:
0.1
,
tapToClose
:
false
,
element
:
$
(
'#content'
)[
0
],
dragger
:
$
(
'#content'
)[
0
],
//dragger: $('[data-domotika-dragger="true"]')[0],
minDragDistance
:
20
,
slideIntent
:
30
,
touchToDrag
:
slideEnabled
});
<
?
}
?
>
<
?
if
(
$left
||
$right
)
{
?
>
function
calcSnapSize
()
...
...
@@ -242,6 +227,21 @@
$
(
".right-drawer"
).
css
(
"width"
,
mval
)
});
var
snapper
=
new
Snap
({
resistance
:
0
,
easing
:
'linear'
,
transitionSpeed
:
0.1
,
tapToClose
:
false
,
element
:
$
(
'#content'
)[
0
],
dragger
:
$
(
'#content'
)[
0
],
//dragger: $('[data-domotika-dragger="true"]')[0],
minDragDistance
:
20
,
slideIntent
:
30
,
touchToDrag
:
slideEnabled
,
maxPosition
:
calcSnapSize
(),
minPosition
:
-
calcSnapSize
()
});
snapper
.
on
(
'animating'
,
function
(
e
)
{
var
mval
=
calcSnapSize
();
...
...
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