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

some more tabs to spaces

Browse source
This commit is contained in:
rolux 2013-06-02 22:19:36 +02:00
parent 064c40461e
commit 4950898b34
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Ox.UI/js/Map/MapPlace.js
View file

@ -52,7 +52,7 @@ Ox.MapPlace = function(options) {
that.center = that.bounds.getCenter(); that.center = that.bounds.getCenter();
that.lat = that.center.lat(); that.lat = that.center.lat();
that.lng = that.center.lng(); that.lng = that.center.lng();
Ox.extend(that.points, { Ox.extend(that.points, {
e: new google.maps.LatLng(that.lat, that.east), e: new google.maps.LatLng(that.lat, that.east),
s: new google.maps.LatLng(that.south, that.lng), s: new google.maps.LatLng(that.south, that.lng),
se: new google.maps.LatLng(that.south, that.east), se: new google.maps.LatLng(that.south, that.east),

12
source/Ox.UI/js/Video/BlockVideoTimeline.js
View file

@ -233,10 +233,10 @@ Ox.BlockVideoTimeline = function(options, self) {
function setCSS() { function setCSS() {
that.css({ that.css({
width: (self.options.width + self.margin) + 'px', width: (self.options.width + self.margin) + 'px',
height: ((self.height + self.margin) * self.lines) + 4 + 'px' height: ((self.height + self.margin) * self.lines) + 4 + 'px'
// fixme: the + 4 represent the margin-bottom in the video editor // fixme: the + 4 represent the margin-bottom in the video editor
// is there a better way to get a proper margin-bottom? // is there a better way to get a proper margin-bottom?
}); });
} }
@ -294,8 +294,8 @@ Ox.BlockVideoTimeline = function(options, self) {
function setWidth() { function setWidth() {
self.lines = getLines(); self.lines = getLines();
setCSS(); setCSS();
Ox.loop(self.lines, function(i) { Ox.loop(self.lines, function(i) {
if (self.$lines[i]) { if (self.$lines[i]) {
self.$lines[i].css({ self.$lines[i].css({
width: self.options.width + 'px' width: self.options.width + 'px'

10
source/Ox.UI/js/Video/VideoEditor.js
View file

@ -70,7 +70,7 @@ Ox.VideoEditor = function(options, self) {
getLargeTimelineURL: null, getLargeTimelineURL: null,
getSmallTimelineURL: null, getSmallTimelineURL: null,
'in': 0, 'in': 0,
height: 0, height: 0,
layers: [], layers: [],
muted: false, muted: false,
out: 0, out: 0,
@ -1002,12 +1002,12 @@ Ox.VideoEditor = function(options, self) {
function getSizes(scrollbarIsVisible) { function getSizes(scrollbarIsVisible) {
var scrollbarWidth = Ox.UI.SCROLLBAR_SIZE, var scrollbarWidth = Ox.UI.SCROLLBAR_SIZE,
contentWidth = self.options.width contentWidth = self.options.width
- (self.options.showAnnotations * self.options.annotationsSize) - 1 - (self.options.showAnnotations * self.options.annotationsSize) - 1
- (scrollbarIsVisible ? scrollbarWidth : 0), - (scrollbarIsVisible ? scrollbarWidth : 0),
height, height,
lines, lines,
size = { size = {
player: [], player: [],
timeline: [] timeline: []
}, },

8
source/Ox.UI/js/Video/VideoEditorPlayer.js
View file

@ -304,17 +304,17 @@ Ox.VideoEditorPlayer = function(options, self) {
if (self.options.type == 'play') { if (self.options.type == 'play') {
self.$video.position(self.options.position); self.$video.position(self.options.position);
} else { } else {
self.$loadingIcon && self.$loadingIcon.stop(); self.$loadingIcon && self.$loadingIcon.stop();
url = self.options.url(position); url = self.options.url(position);
if (self.$video.attr('src') != url) { if (self.$video.attr('src') != url) {
self.$loadingIcon = Ox.LoadingIcon() self.$loadingIcon = Ox.LoadingIcon()
.appendTo(that) .appendTo(that)
.start(); .start();
self.$video.attr({ self.$video.attr({
src: url src: url
}) })
.load(self.$loadingIcon.stop); .load(self.$loadingIcon.stop);
} }
} }
setMarkers(); setMarkers();
setSubtitle(); setSubtitle();

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

@ -738,7 +738,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
function setWidth() { function setWidth() {
self.contentWidth = self.options.width - 2 * self.margin; self.contentWidth = self.options.width - 2 * self.margin;
self.lines = getLines(); self.lines = getLines();
Ox.loop(self.lines, function(i) { Ox.loop(self.lines, function(i) {
if (self.$lines[i]) { if (self.$lines[i]) {
self.$lines[i].css({ self.$lines[i].css({
width: self.contentWidth + 'px' width: self.contentWidth + 'px'

2
source/Ox/js/Geo.js
View file

@ -136,7 +136,7 @@
Math.sin(pointA.lat) * Math.sin(pointB.lat) Math.sin(pointA.lat) * Math.sin(pointB.lat)
+ Math.cos(pointA.lat) * Math.cos(pointB.lat) + Math.cos(pointA.lat) * Math.cos(pointB.lat)
* Math.cos(pointB.lng - pointA.lng) * Math.cos(pointB.lng - pointA.lng)
) * Ox.EARTH_RADIUS; ) * Ox.EARTH_RADIUS;
}; };
/*@ /*@

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

@ -421,7 +421,7 @@
+ code.trim().replace(/</g, '&lt;') + '</code>' + code.trim().replace(/</g, '&lt;') + '</code>'
); );
return salt.join(array.length - 1); return salt.join(array.length - 1);
} }
) )
.replace( .replace(
/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, /(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,