Permalink
Browse files

Merge pull request #300 from jbuck/t1202

Remove window.butter & obsolete test [#1202]
  • Loading branch information...
2 parents efec0ef + 74e8904 commit a66a679323c5bae05fb9b6f4650745e5140f2cbf @secretrobotron secretrobotron committed May 18, 2012
Showing with 0 additions and 155 deletions.
  1. +0 −2 templates/test.js
  2. +0 −46 test/template-import.html
  3. +0 −107 test/template-import.js
View
@@ -32,8 +32,6 @@ document.addEventListener( "DOMContentLoaded", function( e ){
}
media.onReady( start );
-
- window.butter = butter;
}
}); //Butter
}, false );
View
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Basic template</title>
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
- <script src="https://browserid.org/include.js" type="text/javascript"></script>
- <script src="../src/butter.js" data-butter-exclude /></script>
- <script type="text/javascript" src="template-import.js" data-butter-exclude /></script>
- <link rel="stylesheet" href="../src/ui/butter.ui.css" data-butter-exclude />
- <style>
- #main, .content-div {
- float: left;
- }
- .content-div {
- min-width: 200px;
- min-height: 200px;
- border: 3px solid #000;
- margin: 5px;
- }
- .container-div {
- float: left;
- text-align: center;
- font-family: helvetica;
- font-style: bold;
- }
- #main {
- min-width: 300px;
- min-height: 200px;
- }
- </style>
-</head>
-<body>
- <video id="main" data-butter="media" controls >
- <source src="../external/popcorn-js/test/trailer.ogv" />
- </video>
- <div class="container-div">
- <div class="content-div" data-butter="target" id="Area1"></div>
- <p>Area 1</p>
- </div>
- <div class="container-div">
- <div class="content-div" data-butter="target" id="Area2" data-butter-default ></div>
- <p>Area 2</p>
- </div>
- <div id="target-div"></div>
-</body>
-</html>
View
@@ -1,107 +0,0 @@
-var __project = {
- targets: [
- {
- id:"Target0",
- name:"Target0",
- element:"Area1"
- },
- {
- id:"Target1",
- name:"Target1",
- element:"Area2"
- }
- ],
- media: [
- {
- id:"Media0",
- name:"Media0",
- url:"../external/popcorn-js/test/trailer.ogv",
- target:"main",
- duration:9.916666,
- tracks: [
- {
- name:"Track0",
- id:"Track0",
- trackEvents: [
- {
- id:"TrackEvent0",
- type:"text",
- popcornOptions: {
- start:0,
- end:3,
- text:"test",
- target:"Area1"
- },
- track:(void 0),
- name:"TrackEvent0"
- }
- ]
- },
- {
- name:"Track1",
- id:"Track1",
- trackEvents:[]
- },
- {
- name:"Track2",
- id:"Track2",
- trackEvents:[
- {
- id:"TrackEvent1",
- type:"footnote",
- popcornOptions:{
- start:1,
- end:2,
- target:"Area2"
- },
- track:(void 0),
- name:"TrackEvent1"
- }
- ]
- }
- ]
- }
- ]
-};
-
-document.addEventListener( "DOMContentLoaded", function( e ){
-
- Butter({
- config: "../config/default.conf",
- ready: function( butter ){
- var media = butter.media[ 0 ];
-
- function start(){
- var track = media.addTrack( "Track1" );
- media.addTrack( "Track" + Math.random() );
- media.addTrack( "Track" + Math.random() );
-
- var event = track.addTrackEvent({
- type: "text",
- popcornOptions: {
- start: 0,
- end: 3,
- text: "test",
- target: "Area1"
- }
- });
-
- butter.tracks[ 2 ].addTrackEvent({
- type: "footnote",
- popcornOptions: {
- start: 1,
- end: 2,
- target: "Area2"
- }
- });
- }
-
- //media.onReady( start );
- media.onReady(function(){
- butter.importProject( __project );
- });
-
- window.butter = butter;
- }
- }); //Butter
-}, false );

0 comments on commit a66a679

Please sign in to comment.