Skip to content

Commit

Permalink
Roll back to v0.25, keeping the master branch usable. New development…
Browse files Browse the repository at this point in the history
… is moved to the js-rewrite branch.

Reverts:
- "Early implementation of jwPlayer 5." / 765f769.
- "Use jquery instead of document.getelementbyid calls." / cae3c7a.
- "Work in progress: Rewrite to a simpler PHP backend." / 4d2d3a1.
  • Loading branch information
henrik242 committed Jan 20, 2014
1 parent 765f769 commit 360d4d6
Show file tree
Hide file tree
Showing 8 changed files with 1,901 additions and 927 deletions.
1 change: 0 additions & 1 deletion src/jwplayer.min.js

This file was deleted.

Binary file removed src/jwplayer.swf
Binary file not shown.
497 changes: 0 additions & 497 deletions src/mb.js

This file was deleted.

424 changes: 0 additions & 424 deletions src/mb.php

This file was deleted.

Binary file added src/mediaplayer.swf
Binary file not shown.
472 changes: 472 additions & 0 deletions src/musicbrowser.js

Large diffs are not rendered by default.

1,414 changes: 1,414 additions & 0 deletions src/musicbrowser.php

Large diffs are not rendered by default.

20 changes: 15 additions & 5 deletions src/mb.template → src/template.inc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!--[if lte IE 6]><!-- quirksmode --><![endif]-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--
This file is part of Music Browser.
Expand All @@ -15,7 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Music Browser. If not, see <http://www.gnu.org/licenses/>.
Copyright 2006-2013 Henrik Brautaset Aronsen
Copyright 2006-2008 Henrik Brautaset Aronsen
-->
<html>
<head>
Expand Down Expand Up @@ -58,9 +59,18 @@ Copyright 2006-2013 Henrik Brautaset Aronsen
#batplay { padding: 5px; background-color: #ffffff; margin-top: 10px; }
-->
</style>
<script type="text/javascript" src="jquery-latest.min.js"></script>
<script type="text/javascript" src="jwplayer.min.js"></script>
<script type="text/javascript" src="mb.js"></script>

<!-- Workaround for IE5 and IE6 -->
<!--[if lte IE 6]>
<style type="text/css">
body { height: 100%; overflow: hidden; font-size: 100%; }
div#content { width: 100%; height: 100%; overflow: auto; }
div#header, div#footer, div#rightheader, #box { position: absolute; }
</style>
<script type="text/javascript">onload = function() { content.focus() }</script>
<![endif]-->

<script type="text/javascript" src="musicbrowser.js"></script>
</head>
<body>
<div id="box"></div>
Expand Down Expand Up @@ -91,4 +101,4 @@ Copyright 2006-2013 Henrik Brautaset Aronsen
</div>

</body>
</html>
</html>

0 comments on commit 360d4d6

Please sign in to comment.