diff options
| author | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2012-12-29 17:42:35 +0100 |
| commit | 5cf46b6467679ea0367cc0c00787f6f1c86560e4 (patch) | |
| tree | b3f314d1ba574e328f1ce5a27aeadb6ae32980d5 /app/assets | |
| parent | 929e7a391f139ed827e9bd3bea339789a82de6d4 (diff) | |
| parent | 8d20201910b1915cffa495e6474d50f9c8e8331d (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/phones.js.coffee | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 2e0b0d8..1762043 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -10,4 +10,5 @@ //= require vendor/modernizr-2.0.6.min.js //= require vendor/jquery.condom.js //= require vendor/jquery.survival-kit +//= require phones //= require softkeys diff --git a/app/assets/javascripts/phones.js.coffee b/app/assets/javascripts/phones.js.coffee new file mode 100644 index 0000000..ff54777 --- /dev/null +++ b/app/assets/javascripts/phones.js.coffee @@ -0,0 +1,5 @@ +jQuery -> + $(".fallback_sip_account_dropdown").hide() + + $("#phone_hot_deskable").change -> + $(".fallback_sip_account_dropdown").show("slow") |