Permalink
Browse files

Merge pull request #92 from ryanramage/master

Support AMD.
  • Loading branch information...
2 parents 0be46e5 + ae717e4 commit d7111e2d8281bf234ce6ea230028d5442ec8ce3e @thepag thepag committed Oct 9, 2012
Showing with 82 additions and 3 deletions.
  1. +1 −0 .jamignore
  2. +10 −3 jquery.jplayer/jquery.jplayer.js
  3. +31 −0 package.json
  4. +40 −0 skin/blue.monday/skin.handlebars
View
1 .jamignore
@@ -0,0 +1 @@
+actionscript
View
13 jquery.jplayer/jquery.jplayer.js
@@ -15,8 +15,15 @@
/* Code verified using http://www.jshint.com/ */
/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false smarttabs:true */
/*global jQuery:false, ActiveXObject:false, alert:false */
-
-(function($, undefined) {
+(function (root, factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define(['jquery'], factory);
+ } else {
+ // Browser globals
+ factory(root.jQuery);
+ }
+}(this, function ($, undefined) {
// Adapted from jquery.ui.widget.js (1.8.7): $.widget.bridge
$.fn.jPlayer = function( options ) {
@@ -2378,4 +2385,4 @@
CSS_SELECTOR_STRING: "Check your css selector is a string.",
OPTION_KEY: "Check your option name."
};
-})(jQuery);
+}));
View
31 package.json
@@ -0,0 +1,31 @@
+{
+ "name": "jplayer",
+ "version": "2.1.1",
+ "description": "The jQuery HTML5 Audio / Video Library",
+ "homepage": "http://www.jplayer.org/",
+ "keywords": [
+ "audio",
+ "video"
+ ],
+ "dependencies": {
+ "jquery": ">1.4.2"
+ },
+ "licenses": [
+ {
+ "type": "MIT",
+ "url": "http://www.opensource.org/licenses/mit-license.php"
+ },
+ {
+ "type" : "GPL",
+ "url": "http://www.gnu.org/copyleft/gpl.html"
+ }
+ ],
+ "repositories": [
+ {
+ "type": "git",
+ "url": "https://github.com/happyworm/jPlayer.git"
+ }
+ ],
+ "github": "http://github.com/happyworm/jPlayer",
+ "main": "jquery.jplayer/jquery.jplayer.js"
+}
View
40 skin/blue.monday/skin.handlebars
@@ -0,0 +1,40 @@
+<div id="{{jquery_jplayer_id}}" class="jp-jplayer"></div>
+<div id="{{jp_container_id}}" class="jp-audio">
+ <div class="jp-type-single">
+ <div class="jp-gui jp-interface">
+ <ul class="jp-controls">
+ <li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
+ <li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
+ <li><a href="javascript:;" class="jp-stop" tabindex="1">stop</a></li>
+ <li><a href="javascript:;" class="jp-mute" tabindex="1" title="mute">mute</a></li>
+ <li><a href="javascript:;" class="jp-unmute" tabindex="1" title="unmute">unmute</a></li>
+ <li><a href="javascript:;" class="jp-volume-max" tabindex="1" title="max volume">max volume</a></li>
+ </ul>
+ <div class="jp-progress">
+ <div class="jp-seek-bar">
+ <div class="jp-play-bar"></div>
+ </div>
+ </div>
+ <div class="jp-volume-bar">
+ <div class="jp-volume-bar-value"></div>
+ </div>
+ <div class="jp-time-holder">
+ <div class="jp-current-time"></div>
+ <div class="jp-duration"></div>
+ <ul class="jp-toggles">
+ <li><a href="javascript:;" class="jp-repeat" tabindex="1" title="repeat">repeat</a></li>
+ <li><a href="javascript:;" class="jp-repeat-off" tabindex="1" title="repeat off">repeat off</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="jp-title">
+ <ul>
+ <li>{{title}}</li>
+ </ul>
+ </div>
+ <div class="jp-no-solution">
+ <span>Update Required</span>
+ To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
+ </div>
+ </div>
+</div>

0 comments on commit d7111e2

Please sign in to comment.