diff --git a/.bzrignore b/.bzrignore index 85e71b81..86b3939e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,4 +1,4 @@ .DS_Store -build/js/* -build/css +build/Ox.* +build/Ox.UI/* tools/geo/json/_cities.json diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js index 9162905e..d67ccdce 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js @@ -219,4 +219,4 @@ Ox.SmallVideoTimelineImage = function(options, self) { return that; -} +}; diff --git a/source/Ox.UI/js/Video/Ox.VideoElement.js b/source/Ox.UI/js/Video/Ox.VideoElement.js index e451253e..2df4af19 100644 --- a/source/Ox.UI/js/Video/Ox.VideoElement.js +++ b/source/Ox.UI/js/Video/Ox.VideoElement.js @@ -97,7 +97,7 @@ Ox.VideoElement = function(options, self) { function loadPages(callback) { var currentPage = self.currentPage, nextPage = Ox.mod(currentPage + 1, self.numberOfPages), - previousPage = Ox.mod(currentPage - 1, self.numberOfPages) + previousPage = Ox.mod(currentPage - 1, self.numberOfPages); loadPage(currentPage, function() { if (nextPage != currentPage) { loadPage(nextPage, function() { @@ -276,7 +276,7 @@ Ox.VideoElement = function(options, self) { Ox.range(start, stop).forEach(function(i) { if (self.items[i]) { self.items[i].$videos.forEach(function($video) { - $video[0].src = '' + $video[0].src = ''; $video.remove(); }); delete self.items[i]; diff --git a/source/Ox/js/HTML.js b/source/Ox/js/HTML.js index 9c2ebb98..c0ae4544 100644 --- a/source/Ox/js/HTML.js +++ b/source/Ox/js/HTML.js @@ -85,11 +85,11 @@ Ox.parseHTML = (function() { html = Ox.encodeHTML(html); html = Ox.parseURLs(html); html = Ox.parseEmailAddresses(html); - Ox.print(html, 'matches', matches); + //Ox.print('Ox.parseHTML', html, 'matches', matches); matches.forEach(function(match, i) { html = html.replace(new RegExp(tab + i + tab, 'gi'), match); }); - html = html.replace(/\n/g, '
\n') + html = html.replace(/\n/g, '
\n'); // close extra opening (and remove extra closing) tags // note: this converts '"' to '"' return Ox.element('
').html(html).html(); @@ -156,4 +156,4 @@ Ox.parseURLs = function(html) { ); } ); -}; \ No newline at end of file +};