Skip to content

Commit

Permalink
animation without fixed height
Browse files Browse the repository at this point in the history
  • Loading branch information
@tobilarscheid
tobilarscheid committed Aug 25, 2015
1 parent ae88820 commit 9a7df92
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .lock-waf_linux2_build
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
argv = ['/home/ubuntu/pebble-dev/PebbleSDK-3.2/Pebble/waf', 'configure']
environ = {'XDG_GREETER_DATA_DIR': '/var/lib/lightdm-data/ubuntu', 'QT4_IM_MODULE': 'xim', 'HOME': '/home/ubuntu', 'DISPLAY': ':0', 'LANG': 'de_DE.UTF-8', 'SHELL': '/bin/bash', 'XDG_DATA_DIRS': '/usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/', 'MANDATORY_PATH': '/usr/share/gconf/ubuntu.mandatory.path', 'COMPIZ_CONFIG_PROFILE': 'ubuntu', 'JOB': 'dbus', 'TEXTDOMAIN': 'im-config', 'XMODIFIERS': '@im=ibus', 'SELINUX_INIT': 'YES', 'XDG_RUNTIME_DIR': '/run/user/1000', 'PYTHONPATH': '/home/ubuntu/pebble-dev/PebbleSDK-3.2/bin/../.env/lib/python2.7/site-packages', 'COMPIZ_BIN_PATH': '/usr/bin/', 'VTE_VERSION': '3409', 'GNOME_KEYRING_PID': '1482', 'XDG_CURRENT_DESKTOP': 'Unity', 'XDG_SESSION_ID': 'c1', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-MliMom7KlC', 'COLUMNS': '80', 'DEFAULTS_PATH': '/usr/share/gconf/ubuntu.default.path', 'DESKTOP_SESSION': 'ubuntu', 'LESSCLOSE': '/usr/bin/lesspipe %s %s', 'GTK_MODULES': 'overlay-scrollbar:unity-gtk-module', 'INSTANCE': '', 'XDG_MENU_PREFIX': 'gnome-', 'LS_COLORS': 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:', 'XDG_SEAT': 'seat0', 'GNOME_DESKTOP_SESSION_ID': 'this-is-deprecated', 'LINES': '24', 'LESSOPEN': '| /usr/bin/lesspipe %s', 'QT_IM_MODULE': 'ibus', 'LOGNAME': 'ubuntu', 'USER': 'ubuntu', 'GNOME_KEYRING_CONTROL': '/run/user/1000/keyring-qf0Qzg', 'XDG_VTNR': '7', 'PATH': '~/pebble-dev/PebbleSDK-3.2/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/ubuntu/pebble-dev/PebbleSDK-3.2/arm-cs-tools/bin', 'SESSION': 'ubuntu', 'TERM': 'xterm', 'XDG_SESSION_PATH': '/org/freedesktop/DisplayManager/Session0', 'XAUTHORITY': '/home/ubuntu/.Xauthority', 'LANGUAGE': 'de_DE', 'SESSION_MANAGER': 'local/ubuntu-VirtualBox:@/tmp/.ICE-unix/1528,unix/ubuntu-VirtualBox:/tmp/.ICE-unix/1528', 'SHLVL': '1', 'QT_QPA_PLATFORMTHEME': 'appmenu-qt5', 'CLUTTER_IM_MODULE': 'xim', 'WINDOWID': '58722075', 'SESSIONTYPE': 'gnome-session', 'IM_CONFIG_PHASE': '1', 'GPG_AGENT_INFO': '/run/user/1000/keyring-qf0Qzg/gpg:0:1', 'SSH_AUTH_SOCK': '/run/user/1000/keyring-qf0Qzg/ssh', 'GDMSESSION': 'ubuntu', 'TEXTDOMAINDIR': '/usr/share/locale/', 'NO_GCE_CHECK': 'False', 'XDG_SEAT_PATH': '/org/freedesktop/DisplayManager/Seat0', '_': '/home/ubuntu/pebble-dev/PebbleSDK-3.2/bin/pebble', 'GTK_IM_MODULE': 'ibus', 'UPSTART_SESSION': 'unix:abstract=/com/ubuntu/upstart-session/1000/1321', 'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg', 'OLDPWD': '/home/ubuntu/git/Frebble-Pebble/config', 'GDM_LANG': 'de_DE', 'NODE_PATH': '/usr/lib/nodejs:/usr/lib/node_modules:/usr/share/javascript', 'PWD': '/home/ubuntu/git/Frebble-Pebble', 'COLORTERM': 'gnome-terminal'}
environ = {'XDG_GREETER_DATA_DIR': '/var/lib/lightdm-data/ubuntu', 'QT4_IM_MODULE': 'xim', 'HOME': '/home/ubuntu', 'DISPLAY': ':0', 'LANG': 'de_DE.UTF-8', 'SHELL': '/bin/bash', 'XDG_DATA_DIRS': '/usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/', 'MANDATORY_PATH': '/usr/share/gconf/ubuntu.mandatory.path', 'COMPIZ_CONFIG_PROFILE': 'ubuntu', 'JOB': 'dbus', 'TEXTDOMAIN': 'im-config', 'XMODIFIERS': '@im=ibus', 'SELINUX_INIT': 'YES', 'XDG_RUNTIME_DIR': '/run/user/1000', 'PYTHONPATH': '/home/ubuntu/pebble-dev/PebbleSDK-3.2/bin/../.env/lib/python2.7/site-packages', 'COMPIZ_BIN_PATH': '/usr/bin/', 'VTE_VERSION': '3409', 'GNOME_KEYRING_PID': '1482', 'XDG_CURRENT_DESKTOP': 'Unity', 'XDG_SESSION_ID': 'c1', 'DBUS_SESSION_BUS_ADDRESS': 'unix:abstract=/tmp/dbus-MliMom7KlC', 'COLUMNS': '80', 'DEFAULTS_PATH': '/usr/share/gconf/ubuntu.default.path', 'DESKTOP_SESSION': 'ubuntu', 'LESSCLOSE': '/usr/bin/lesspipe %s %s', 'GTK_MODULES': 'overlay-scrollbar:unity-gtk-module', 'INSTANCE': '', 'XDG_MENU_PREFIX': 'gnome-', 'LS_COLORS': 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36:', 'XDG_SEAT': 'seat0', 'GNOME_DESKTOP_SESSION_ID': 'this-is-deprecated', 'LINES': '24', 'LESSOPEN': '| /usr/bin/lesspipe %s', 'QT_IM_MODULE': 'ibus', 'LOGNAME': 'ubuntu', 'USER': 'ubuntu', 'GNOME_KEYRING_CONTROL': '/run/user/1000/keyring-qf0Qzg', 'XDG_VTNR': '7', 'PATH': '~/pebble-dev/PebbleSDK-3.2/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/ubuntu/pebble-dev/PebbleSDK-3.2/arm-cs-tools/bin', 'SESSION': 'ubuntu', 'TERM': 'xterm', 'XDG_SESSION_PATH': '/org/freedesktop/DisplayManager/Session0', 'XAUTHORITY': '/home/ubuntu/.Xauthority', 'LANGUAGE': 'de_DE', 'SESSION_MANAGER': 'local/ubuntu-VirtualBox:@/tmp/.ICE-unix/1528,unix/ubuntu-VirtualBox:/tmp/.ICE-unix/1528', 'SHLVL': '1', 'QT_QPA_PLATFORMTHEME': 'appmenu-qt5', 'CLUTTER_IM_MODULE': 'xim', 'WINDOWID': '58750911', 'SESSIONTYPE': 'gnome-session', 'IM_CONFIG_PHASE': '1', 'GPG_AGENT_INFO': '/run/user/1000/keyring-qf0Qzg/gpg:0:1', 'SSH_AUTH_SOCK': '/run/user/1000/keyring-qf0Qzg/ssh', 'GDMSESSION': 'ubuntu', 'TEXTDOMAINDIR': '/usr/share/locale/', 'NO_GCE_CHECK': 'False', 'XDG_SEAT_PATH': '/org/freedesktop/DisplayManager/Seat0', '_': '/home/ubuntu/pebble-dev/PebbleSDK-3.2/bin/pebble', 'GTK_IM_MODULE': 'ibus', 'UPSTART_SESSION': 'unix:abstract=/com/ubuntu/upstart-session/1000/1321', 'XDG_CONFIG_DIRS': '/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg', 'OLDPWD': '/home/ubuntu/git', 'GDM_LANG': 'de_DE', 'NODE_PATH': '/usr/lib/nodejs:/usr/lib/node_modules:/usr/share/javascript', 'PWD': '/home/ubuntu/git/Frebble-Pebble', 'COLORTERM': 'gnome-terminal'}
files = ['/home/ubuntu/git/Frebble-Pebble/wscript']
hash = 2423177563626642261
options = {'files': '', 'jobs': 2, 'verbose': 0, 'nocache': False, 'progress_bar': 0, 'timestamp': None, 'distcheck_args': None, 'top': '', 'destdir': '', 'keep': 0, 'zones': '', 'debug': False, 'prefix': '/usr/local/', 'download': False, 'force': False, 'targets': '', 'out': ''}
Expand Down
4 changes: 2 additions & 2 deletions appinfo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"shortName": "Frebble",
"uuid": "5367c955-d5cb-4cb6-ae62-3a2f3c0e11ef",
"versionCode": 1,
"versionLabel": "1.0",
"versionLabel": "1.2",
"watchapp": {
"watchface": true
},
"targetPlatforms": [
"aplite"
]
}
}
40 changes: 40 additions & 0 deletions appinfo.json~
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"appKeys": {
"MAX_UP" : 0,
"MAX_DOWN" : 1,
"AVAILABLE_UP" : 2,
"AVAILABLE_DOWN" : 3,
"UPTIME" : 4,
"CONNECTION_STATUS" : 5,
"REFRESH_CYCLE" : 6,
"WANCIC_URL" : 7,
"WANIPC_URL" : 8,
"AUTOMATIC_DISCOVERY" : 9,
"FRITZ_IP" : 10,
"FRITZ_PORT" : 11,
"MESSAGE_TYPE" : 12,
"ERROR_STRING" : 13,
"ENABLE_AUTOMATIC_REFRESH" : 14

},
"capabilities": [
"configurable"
],
"companyName": "Lutschbirne",
"longName": "Frebble Watchface",
"projectType": "native",
"resources": {
"media": []
},
"sdkVersion": "3",
"shortName": "Frebble",
"uuid": "5367c955-d5cb-4cb6-ae62-3a2f3c0e11ef",
"versionCode": 1,
"versionLabel": "1.0",
"watchapp": {
"watchface": true
},
"targetPlatforms": [
"aplite"
]
}
3 changes: 1 addition & 2 deletions config/css/style.css
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.hideable-area{
height: 0px;
overflow: hidden;
display: block;
transition: height 200ms;
transition: max-height 350ms;
}

.hideable-area:not(:first-child) {
Expand Down
8 changes: 4 additions & 4 deletions config/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,17 @@ function portValid(){

function toggleAutomaticDiscovery(){
if (automaticDiscoveryToggle[0].checked){
$("#service-urls-wrapper").css("height","0px");
$("#service-urls-wrapper").css("max-height","0px");
}else{
$("#service-urls-wrapper").css("height","159px");
$("#service-urls-wrapper").css("max-height","200px");
}
}

function toggleAutomaticRefresh() {
if (enableAutomaticRefresh[0].checked) {
$("#refreshcycle-wrapper").css("height","79px");
$("#refreshcycle-wrapper").css("max-height","150px");
} else {
$("#refreshcycle-wrapper").css("height","0px");
$("#refreshcycle-wrapper").css("max-height","0px");
}

}
Expand Down

0 comments on commit 9a7df92

Please sign in to comment.