From 3bbc4beae57abe8516c199a206d0e70184998789 Mon Sep 17 00:00:00 2001 From: Matthieu Lalonde Date: Fri, 9 Nov 2012 11:50:09 -0500 Subject: [PATCH] Fixed player selectors --- resources/css/app.css | 6 +++--- resources/css/player.css | 4 ++-- resources/js/views/player.js | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index 8891b05..06cb6cf 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -53,7 +53,7 @@ body.loading > * { /** * Elements */ -div#wrapperPlayer { +body > div.ui-layout-north { margin: 0; padding: 0; /*height: 75px;*/ @@ -361,7 +361,7 @@ body > .ui-layout-south, table.dataTable tr td, table.dataTable tr th, body > .ui-layout-west, -div#wrapperPlayer { +body > div.ui-layout-north { -webkit-user-select: none; -ms-user-select: none; -moz-user-select: none; @@ -402,7 +402,7 @@ div.drag-table-item { opacity: 0.8; } -div#wrapperPlayer { +body > div.ui-layout-north { background: url('../img/viewport_background.png') repeat-x; height: 50px; } diff --git a/resources/css/player.css b/resources/css/player.css index 3642e45..bfff9c2 100644 --- a/resources/css/player.css +++ b/resources/css/player.css @@ -1,5 +1,5 @@ -div#wrapperPlayer #daaprPlayerViewport { +body > div.ui-layout-north #daaprPlayerViewport { margin: 6px auto 0 auto; background: transparent url('../img/player_background.png') repeat-x; height: 40px; @@ -13,7 +13,7 @@ div#wrapperPlayer #daaprPlayerViewport { z-index: 10; } -div#wrapperPlayer #daaprPlayerViewport h1 { +body > div.ui-layout-north #daaprPlayerViewport h1 { color: #5F5F5F; font-size: 2em; font-style: oblique; diff --git a/resources/js/views/player.js b/resources/js/views/player.js index aac12a1..98d6d41 100644 --- a/resources/js/views/player.js +++ b/resources/js/views/player.js @@ -21,7 +21,11 @@ _ "use strict"; var Player = Backbone.View.extend({ - el: $("body > div.ui-layout-north") + el: $("body > div.ui-layout-north") + + , playIndex: [] + + , webAudio: null , initialize: function (options) { var that = this @@ -33,6 +37,36 @@ _ return that; } + + , setPlayIndex: function (index) { + var that = this + ; + + } + + , _createWebAudio: function () { + var that = this + ; + + } + + , __waStateChanged: function () { + var that = this + ; + + } + + , _playerEnded: function () { + var that = this + ; + + } + + , _playerLoading: function () { + var that = this + ; + + } }); return Player;