Players

Commits

Jul 31, 2012

IE8 and below styling issues. getSlug to help with pushState

3b656e4451ad993b04c8bda5a3baec3e01334468

Merge remote-tracking branch 'origin/dt-80-update-ad-calls'

abe63af56949a09780ae0a93aabed4dde2a82eef

Build out ad tags The ad tag URLs are now generated by a template tag. They also contain way more information than they originally did and support a `noscript` version as well.

5527ed0ea046077443f664c86e0fe178495867fc

Merge branch 'working_player' of github.com:cbslocal/The-Impossible-Dream into working_player

59c84cabc4dd87bb384483f88fba74dfa5211053

Merge remote-tracking branch 'origin/working_player' into working_player

191c5fa0676556594b95eff8dff45ffe0c63cff4

- fix bad checkin where tag-line was being retured for callsign

4b0ca187d9a841a8350ac32ba0add7a7d250520b

Merge branch 'working_player' of github.com:cbslocal/The-Impossible-Dream into working_player

d07fe2ddd9f6f6af3ce91a768c625e9869b413f8

Add missing if When generating the index page, the `stationId` variable is set when a user has requested a specific station. It shouldn't write out a value when a station isn't requested. This if should have been included in 116234d but I forgot it.

9c9e9b163182209935d9702a4e1dc41911b05eb1

Merge branch 'master' of https://github.com/cbslocal/The-Impossible-Dream.git

344cd25a7fc961a488e33c822831da1b8e9e5269

Merge remote-tracking branch 'origin/working_player' into working_player Conflicts: dulcinea/static/js/com/cbs/platform/station/station.js dulcinea/static/js/player/playercontrols.js dulcinea/static/js/player/uicontroller.js

6c3f91d4486e7ad13a50d3b481a18056cd6f2d9a

Merge pull request #27 from cbslocal/refactor-api-client Add a management command to update cached data

8df08ddf2fb0634a743cde5b20d8e16b3b72389b

Add a management command to update cached data This management command can be used to update data received from the API. It calls the `_get_from_cache_or_remote()` method directly, passing it `True` for `ignore_cache`. It is important that this command is updated to reflect not only new API calls, but changes to the aforementioned method as well.

4eddf852685bc9bf9f34393f6ae83688d33fd6b8

- Remove extra commas, defined some vars - **it is not cool to manipulate params, define new vars**!!

9babe5438ae4fef065f30c4b27334d14b0341241

Merge remote-tracking branch 'origin/master' into working_player

c4b8d7670df39fe99423ca6860754e528583aba6

Merge pull request #26 from cbslocal/refactor-api-client Refactor api client

a0db75e513f175a0f90f3e78792ca90c22fc9453

Add pretty URLs A station can now be loaded by going to `/player/[SLUG]/`. This will take priority over the `station_id` query var. When a valid station is requested, its ID is injected into the JavaScript and used before checking the query string. The handling of invalid stations will follow.

116234dca28f1b0e23eb53b2aecaf49e67a844be

Remove unnecessary parameters to HttpResponse objects `HttpResponse` objects use 200 as the default `status_code`. Therefore there is no reason to manually set it as well. Also, `mimetype` is a legacy parameter; `content_type` is the proper one to use. Additionally I am renaming the response object to `response` from `req` (request?).

adb8c32e2469059444cc51fb926c29a620cbfdb4

Remove manual calls to gzip middleware Since middlewares already process each request, there is no need to manually call it from views as well.

5a09ec44424ced761357e253b97cf0f6c3883f84

Update HTTP access to use Requests Requests is already included in the base Pip requirements file. Why anyone would then choose to use urllib instead is beyond me.

d0a06158f19461a8ae6d61f4b5569f26ff37f8ca

Merge branch 'master' of https://github.com/cbslocal/The-Impossible-Dream

219dd644e40b6ebd0faa48dc315e2e7aae1124be

Add ability to force API client to refetch data from the remote When the `ignore_cache` parameter is set to `True`, the cache check will be skipped and the data will be refetched from the API. Just as before, the result will be cached for an hour. Currently there is no protection against repeated calls when there is no response or result to cache. Since I was adding a new parameter to the `_get_from_cache_or_remote` method, I decided to rename `attr` to `action` as this seemed to fit with the API terminology a little better. I also elected to improve the method's docstring to better document the parameters.

94ee9d44ccef7a450c285e219d46b7e63d11d532

Remove get_cached_data() With the introduction of the client API wrapper class, the `get_cached_data()` method is no longer needed. :fireworks:

3e47effb9000f7739c998aae4af75ecad74dcc47

Add station types to client API The `API.get_station_types()` method will fetch the list of station types from the API and cache the result for an hour. As of this change, `get_cached_data()` is no longer needed.

ab5b79f639ff01d56c60a364f8020613539ca908

Add gallery to API client The `API.get_gallery()` method will fetch an individual gallery by ID from the API and cache the result for an hour.

299845def52cfcaa94662271aee945345488b805

Add galleries to API client The `API.get_galleries()` method will fetch the list of galleries from the API and cache the result for an hour.

d0c2481f1a9bce45cf557429ba3bc6dbe62c8ae0

Add _get_from_cache_or_remote method to client API It appears that there will be a lot of repetition in the methods contained in the client API wrapper class. The `get_from_cache_or_remote()` method can contain all of the smarts and allow each individual method just to wrap it.

8530d0f5a798c7d2e42c450a54b54d286d5fffb2

Remove unnecessary guide HTML When the player page renders, HTML for the guide is rendered but is always replaced by the `get_guide_html` view. Also, since stations are no longer passed in through the context, they wouldn't print out anyway.

693403d75897fa49bf6ca6eaac60e2eb43955253

Add station to API client The `API.get_station()` method will fetch an individual station by ID or by slug (ID takes precedence) from the API and cache the result for an hour. As part of this change, the `get_station` view no longer includes the 'objects' key in its response (it probably shouldn't have anyway). The JavaScript needs all references to `objects` removed. Hopefully I got them all.

95749d4b97ea8b34641a7a3aeb03bc278751197f

Add stations to API client The `API.get_stations()` method will fetch the list of stations from the API and cache the result for an hour.

891c75e2b2c13b50f04c4014c23b7793a6952203

Begin API client class This class is meant to wrap around an instance of `PlayerAPI` and will replace `get_cached_data()`.

8ef653ae100160ca61dd0decc2943fd236fc6cf0

Jul 30, 2012

Merge branch 'master' of https://github.com/cbslocal/The-Impossible-Dream.git

590e602ee513c44731e41a97edeb5615a595b7b8

- FLProxy.js filename incorrect - changed to lower case

e2fde15e8a4f1f57da0f92a8d127870149372731

Merge branch 'master' of github.com:cbslocal/The-Impossible-Dream

6271ea5af625968fda28edc9a17072a9942d8f83

Line endings! Windows needs to be shot in the face. Twice!

adf4ed7adc90b2bfe55ed2f875ee9c7d12914501

Merge branch 'master' of github.com:cbslocal/The-Impossible-Dream

e462752aa856ce25d160712c68737ec81a0b996d

More whitespace weirdness. Ran a DIFF, only change was in the credits

a41236f5a27b9c71979d60bfd76a2cb117946b95

Update guide view for API structure change The market's ID is no longer included in the data returned from Wally. The value for city should be sufficiently unique to take its place here.

1c93372102192fda5e077915b55d29ffb2e70a71

Merge branch 'working_player' of github.com:cbslocal/The-Impossible-Dream into working_player

92cb04afd33165315392c3fed8b30a5e485cab6a

Update guide view for API structure change The station data being returned from Wally now includes station type and format as just the name. Previously it had been returning all data associated with the data models associated with each.

b87b18ccb6d66dd4fec171ecd26dfb8363b432b4

- protect against non-existent nodes/data - new stw swf

a3769b81dfb3ecb433bd6f95cf9f324e099a015f

Merge branch 'working_player' of http://github.com/cbslocal/The-Impossible-Dream into working_player Conflicts: dulcinea/static/js/player/playercontrols.js dulcinea/static/js/player/uicontroller.js

ded77b9d7f1d5ae4f540645b4e3a45535a10e049

Merge branch 'master' of github.com:cbslocal/The-Impossible-Dream into working_player

ae8b94edf57de78be7fd838480d867eac1369e02

Merge remote-tracking branch 'origin/master' into working_player Conflicts: dulcinea/static/js/mediaplayer.js

b2e59e5359b53e01bac049c8cb89a78a4d728d90

Properly brought over the station logo linking after a hasty junk job before

b47b23bafdae0cb2a4e0e3e04d2c37a66798a0b5

Merge branch 'working_player' of github.com:cbslocal/The-Impossible-Dream into working_player

dad5e3307129245d942fbb156194f9849e93d508

Bringing this branch up to speed with my old one. Guide formats. Clickable logo. IE z-index fixes for gallery pager

a24c4c572fcd07344c6717ba79e03957707357ba

Jul 29, 2012

Jul 28, 2012

- more refactoring... - new STW streaming logic merges and working - tons of fixes and optimizations for the better!! Still to do: - hook-up cue points to JS and front end - moved instream ad request logic from swf to JS - need to hook it up - why isn't twitter working..i dunnoo - toggling button states and stream error handling - stuff needs to be realigned

3a6e3ae55d125e458ad2f3970ac3e7c02bba6737

Jul 27, 2012

Defined a bottom marging for .guide_loader in order to push guide tables out of the way when user selects them before guide fully loads

426b112c552beeb93ede6e0b8a7485a7443b086b

Jul 26, 2012

changes to enable user to click station logo and navigate to current stations site

e68cc81226a1f8e4fc10f9a90571a1d57b5b65e0

urls.py keeps coming up as modified and I swear I'm not touching it

12c60ec0ee6f1d4ba34f26da2738df7fbf158ab9

this file keeps coming up as modified and I swear I'm not touching it

9e7848001fcc7fec95e04980c8f1cd216de3a117

Merge pull request #24 from cbslocal/add-formats-to-guide Hide station grid's immediate children

56f4096cc2c3218e8bfc57927aff2a149ba72c5b

Hide station grid's immediate children The change I made in 73d0613 introduced a change to the structure of the guide's HTML. This change was also reflected in the JavaScript. When pushing the code up to the preprod server I realized, however, that the JavaScript was up to date while the HTML was stuck behind the hour-long cache. This change targets the station grid's immediate children, rather than using a selector referencing a specific tag. This should allow the JavaScript to work with whichever version of the HTML is being returned.

0467ad8d723efd7414aa790a37744113f813ddc5

Merge branch 'master' of heroku.com:stormy-moon-3596 Conflicts: dulcinea/player/urls.py dulcinea/static/js/mediaplayer.js

3c5fd06c647ce15c992ec1ad883ac4aed02e6344

Clean up README, part deux GitHub-flavored Markdown treats continuous code blocks as one, regardless of how much whitespace is placed in between. This change makes things look better visually when viewing on GitHub.

2cf5cd98d311bbdd5d0a0db43adcc5283d1bb1bd

Clean up README The initial version (with content) of the README wasn't formatted so nicely for Markdown. Now it is. It is also a little more organized.

a8076df5b37b92f1b227331bd713bca6cf24bf1e

Merge pull request #23 from cbslocal/add-formats-to-guide Add formats to guide

289cbf95feaafeadd572e4418381a6b0c33cc659

Merge remote-tracking branch 'origin/master' into add-formats-to-guide Conflicts: dulcinea/player/urls.py dulcinea/static/js/mediaplayer.js

91472d8e045da76353ab90b4d32b08559a87d2b4

Merge branch 'master' of github.com:cbslocal/The-Impossible-Dream Conflicts: dulcinea/static/js/mediaplayer.js

9222ac3e5e4133caa28131ed986af122fcd6100d

This is an annoying commit I cannot pull changes from the remote or change branches locally because these two files have Windows line endings and my system keeps replacing them with proper line endings. This should be fun. WHEEEEE!!!!!!

0a430fd8dfd85e49a32b473c5848902ca83d1020

Jul 25, 2012

Alphabetize formats and locations When displaying station groupings in the guide, it's much better if the groupings are listed alphabetically. To do this, stations are grouped using dictionaries. The dictionaries are then converted to lists. Finally the Django template tag `dictsort` is used to sort the groupings alphabetically for display.

2fedfb01901cb56cf5756e40dcad7f4b48dd9fb4

Station info H tags reassigned to more befitting levels. CSS to match

baed0fc00fee71a73b792777412fdde24d4d2c94

Checking these files for bad characters when they were pulled down from master. Trying to push to my branch and now saying these were modified when they weren't even opened.

18d15c304aa7895526a422ca7f76ce3f536f1f35

This is just a test for the line feed thing. Added a comment at end of file

6bcb5e8a304077a0f2b6b62715a512c305866e0a

Add formats and locations to station guide In order to better display our music stations, all stations are now grouped by format within type. With this change, each tab within the guide now contains one or more tables. To handle showing and hiding, each tab is now a div (containing the table(s)) instead of a table. The JavaScript had to be updated to accommodate this change. A list of stations by location is also being added to the guide. A location is defined as "City Name, State."

73d06134c4fa023dbd30fe853809b2057dca1b98

Comscore addition. Please check all but base.html. Wiped computer and GIT says these are modified for some reason. Should be whitespace

a20fbebf6a4af9bb630738571da1285f24904c84

Fix indentation There was a tab. Bad tab!! (All other changes appear to be the result of Windows line endings creeping into the repository. Bad Windows settings!!)

4aab892622222cefe30e26e46fb268bd0937e982

Merge branch 'master' of github.com:cbslocal/The-Impossible-Dream

60cc17fd63317248fbb0ca48e7e0be0c41d05d3e

Update dulcinea/player/views.py - BAD MERGE!! Wtf is happening here.  

56d268252822573437b4fc811c9ece919a0b232a

Merge remote-tracking branch 'origin/master' into jirickImpossibleDream

8baf3b96d06e8257ca712d4b72fc99299b423a42

Adding some console debug stuff for the video ad thingy

99aa06b63969eca910725c00e094930eaf35dc21

Jul 24, 2012