This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fix CRLF

Add .gitattributes and set the default behavior, in case people do not have core.autocrlf set
  • Loading branch information...
stevemao committed Feb 17, 2015
1 parent 19cb6b0 commit 6251bf54ae1dd6b89e1b3ca04daa988328e6f108
Showing with 170 additions and 169 deletions.
  1. +1 −0 .gitattributes
  2. +56 −56 plugins/documentcloud/popcorn.documentcloud.html
  3. +110 −110 test/archaic.html
  4. +3 −3 test/popcorn.unit.archaic.setup.js
View
@@ -0,0 +1 @@
* text=auto
@@ -1,56 +1,56 @@
<!DOCTYPE html>
<head>
<script src="../../popcorn.js"></script>
<script src="popcorn.documentcloud.js"></script>
<script>
Popcorn(function() {
var popcorn = Popcorn( "#video" )
.documentcloud({
start: 3,
end: 6,
url: "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html",
width: 900,
height: 500,
showAnnotations: true,
page: 5,
target: "documentcloud-div"
})
.documentcloud({
start: 7,
end: 10,
url: "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html",
page: 25,
target: "documentcloud-div"
})
.documentcloud({
start: 11,
end: 20,
url: "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html",
aid: 9899,
target: "documentcloud-div"
})
.volume( 0 )
.play();
});
</script>
</head>
<body>
<video id="video"
controls
width="250px"
poster="../../test/poster.png">
<source id="mp4"
src="../../test/trailer.mp4"
type='video/mp4; codecs="avc1, mp4a"'>
<source id="ogv"
src="../../test/trailer.ogv"
type='video/ogg; codecs="theora, vorbis"'>
<p>Your user agent does not support the HTML5 Video element.</p>
</video>
<div id="documentcloud-div"></div>
</body>
</html>
<!DOCTYPE html>
<head>
<script src="../../popcorn.js"></script>
<script src="popcorn.documentcloud.js"></script>
<script>
Popcorn(function() {
var popcorn = Popcorn( "#video" )
.documentcloud({
start: 3,
end: 6,
url: "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html",
width: 900,
height: 500,
showAnnotations: true,
page: 5,
target: "documentcloud-div"
})
.documentcloud({
start: 7,
end: 10,
url: "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html",
page: 25,
target: "documentcloud-div"
})
.documentcloud({
start: 11,
end: 20,
url: "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html",
aid: 9899,
target: "documentcloud-div"
})
.volume( 0 )
.play();
});
</script>
</head>
<body>
<video id="video"
controls
width="250px"
poster="../../test/poster.png">
<source id="mp4"
src="../../test/trailer.mp4"
type='video/mp4; codecs="avc1, mp4a"'>
<source id="ogv"
src="../../test/trailer.ogv"
type='video/ogg; codecs="theora, vorbis"'>
<p>Your user agent does not support the HTML5 Video element.</p>
</video>
<div id="documentcloud-div"></div>
</body>
</html>
View
@@ -1,110 +1,110 @@
<!DOCTYPE html>
<html>
<head>
<title>Simulate Archaic Browser</title>
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
<style>
body {
margin: 3px;
padding: 0px;
}
h3 {
margin: 3px;
padding: 0px;
}
h2 {
display: inline;
margin: 3px;
padding: 0px;
}
.pass {
color: #33FF00;
}
.expect {
color: #2d2d2d;
}
.fail {
color: #FF0000;
}
</style>
<script src="jquery.js"></script>
<script src="qunit/qunit.js"></script>
<!--
do not move - this must be called immediately prior to
popcorn-api-draft.js
-->
<script src="popcorn.unit.setup.js"></script>
<script src="popcorn.unit.archaic.setup.js"></script>
<script src="../popcorn.js"></script>
<script src="popcorn.unit.archaic.js"></script>
<script>
(function( Popcorn, $ ) {
var results = {
pass: 0,
fail: 0,
expect: 40
};
$(function() {
function isComplete( callback ) {
if ( !QUnit.config.queue.length ) {
// is complete
callback && callback( QUnit.config.stats );
} else {
setTimeout(function() {
isComplete( callback );
}, 10 );
}
}
isComplete(function( qResults ) {
// Hack together the results as used in ready.html
results.pass = qResults.all - qResults.bad;
results.fail = qResults.bad;
results.expect = qResults.all;
$.each( results, function( name, value ) {
$("#qunit-header").before(
$("<h2>", {
className: name,
html: name + ": " + value
})
);
});
});
});
})( Popcorn, jQuery );
</script>
</head>
<body>
<h3>Archaic<h3>
<h1 id="qunit-header">
Popcorn.js: Simulate Archaic Browser
</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit-fixture">
</div>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
<title>Simulate Archaic Browser</title>
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen">
<style>
body {
margin: 3px;
padding: 0px;
}
h3 {
margin: 3px;
padding: 0px;
}
h2 {
display: inline;
margin: 3px;
padding: 0px;
}
.pass {
color: #33FF00;
}
.expect {
color: #2d2d2d;
}
.fail {
color: #FF0000;
}
</style>
<script src="jquery.js"></script>
<script src="qunit/qunit.js"></script>
<!--
do not move - this must be called immediately prior to
popcorn-api-draft.js
-->
<script src="popcorn.unit.setup.js"></script>
<script src="popcorn.unit.archaic.setup.js"></script>
<script src="../popcorn.js"></script>
<script src="popcorn.unit.archaic.js"></script>
<script>
(function( Popcorn, $ ) {
var results = {
pass: 0,
fail: 0,
expect: 40
};
$(function() {
function isComplete( callback ) {
if ( !QUnit.config.queue.length ) {
// is complete
callback && callback( QUnit.config.stats );
} else {
setTimeout(function() {
isComplete( callback );
}, 10 );
}
}
isComplete(function( qResults ) {
// Hack together the results as used in ready.html
results.pass = qResults.all - qResults.bad;
results.fail = qResults.bad;
results.expect = qResults.all;
$.each( results, function( name, value ) {
$("#qunit-header").before(
$("<h2>", {
className: name,
html: name + ": " + value
})
);
});
});
});
})( Popcorn, jQuery );
</script>
</head>
<body>
<h3>Archaic<h3>
<h1 id="qunit-header">
Popcorn.js: Simulate Archaic Browser
</h1>
<h2 id="qunit-banner"></h2>
<div id="qunit-testrunner-toolbar"></div>
<h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol>
<div id="qunit-fixture">
</div>
</body>
</html>
@@ -1,3 +1,3 @@
document.addEventListener = null;
document.addEventListener = null;

0 comments on commit 6251bf5

Please sign in to comment.