0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

merge

Browse source
This commit is contained in:
rlx 2011-10-24 15:59:25 +00:00
commit c4116ca17c
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.bzrignore
View file

@ -1,4 +1,4 @@
.DS_Store .DS_Store
build/js/* build/Ox.*
build/css build/Ox.UI/*
tools/geo/json/_cities.json tools/geo/json/_cities.json

2
source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js
View file

@ -219,4 +219,4 @@ Ox.SmallVideoTimelineImage = function(options, self) {
return that; return that;
} };

4
source/Ox.UI/js/Video/Ox.VideoElement.js
View file

@ -97,7 +97,7 @@ Ox.VideoElement = function(options, self) {
function loadPages(callback) { function loadPages(callback) {
var currentPage = self.currentPage, var currentPage = self.currentPage,
nextPage = Ox.mod(currentPage + 1, self.numberOfPages), nextPage = Ox.mod(currentPage + 1, self.numberOfPages),
previousPage = Ox.mod(currentPage - 1, self.numberOfPages) previousPage = Ox.mod(currentPage - 1, self.numberOfPages);
loadPage(currentPage, function() { loadPage(currentPage, function() {
if (nextPage != currentPage) { if (nextPage != currentPage) {
loadPage(nextPage, function() { loadPage(nextPage, function() {
@ -276,7 +276,7 @@ Ox.VideoElement = function(options, self) {
Ox.range(start, stop).forEach(function(i) { Ox.range(start, stop).forEach(function(i) {
if (self.items[i]) { if (self.items[i]) {
self.items[i].$videos.forEach(function($video) { self.items[i].$videos.forEach(function($video) {
$video[0].src = '' $video[0].src = '';
$video.remove(); $video.remove();
}); });
delete self.items[i]; delete self.items[i];

4
source/Ox/js/HTML.js
View file

@ -85,11 +85,11 @@ Ox.parseHTML = (function() {
html = Ox.encodeHTML(html); html = Ox.encodeHTML(html);
html = Ox.parseURLs(html); html = Ox.parseURLs(html);
html = Ox.parseEmailAddresses(html); html = Ox.parseEmailAddresses(html);
Ox.print(html, 'matches', matches); //Ox.print('Ox.parseHTML', html, 'matches', matches);
matches.forEach(function(match, i) { matches.forEach(function(match, i) {
html = html.replace(new RegExp(tab + i + tab, 'gi'), match); html = html.replace(new RegExp(tab + i + tab, 'gi'), match);
}); });
html = html.replace(/\n/g, '<br/>\n') html = html.replace(/\n/g, '<br/>\n');
// close extra opening (and remove extra closing) tags // close extra opening (and remove extra closing) tags
// note: this converts '&quot;' to '"' // note: this converts '&quot;' to '"'
return Ox.element('<div>').html(html).html(); return Ox.element('<div>').html(html).html();