some more tabs to spaces
This commit is contained in:
parent
064c40461e
commit
4950898b34
7 changed files with 19 additions and 19 deletions
|
@ -52,7 +52,7 @@ Ox.MapPlace = function(options) {
|
|||
that.center = that.bounds.getCenter();
|
||||
that.lat = that.center.lat();
|
||||
that.lng = that.center.lng();
|
||||
Ox.extend(that.points, {
|
||||
Ox.extend(that.points, {
|
||||
e: new google.maps.LatLng(that.lat, that.east),
|
||||
s: new google.maps.LatLng(that.south, that.lng),
|
||||
se: new google.maps.LatLng(that.south, that.east),
|
||||
|
|
|
@ -233,10 +233,10 @@ Ox.BlockVideoTimeline = function(options, self) {
|
|||
|
||||
function setCSS() {
|
||||
that.css({
|
||||
width: (self.options.width + self.margin) + 'px',
|
||||
height: ((self.height + self.margin) * self.lines) + 4 + 'px'
|
||||
// fixme: the + 4 represent the margin-bottom in the video editor
|
||||
// is there a better way to get a proper margin-bottom?
|
||||
width: (self.options.width + self.margin) + 'px',
|
||||
height: ((self.height + self.margin) * self.lines) + 4 + 'px'
|
||||
// fixme: the + 4 represent the margin-bottom in the video editor
|
||||
// is there a better way to get a proper margin-bottom?
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -294,8 +294,8 @@ Ox.BlockVideoTimeline = function(options, self) {
|
|||
|
||||
function setWidth() {
|
||||
self.lines = getLines();
|
||||
setCSS();
|
||||
Ox.loop(self.lines, function(i) {
|
||||
setCSS();
|
||||
Ox.loop(self.lines, function(i) {
|
||||
if (self.$lines[i]) {
|
||||
self.$lines[i].css({
|
||||
width: self.options.width + 'px'
|
||||
|
|
|
@ -70,7 +70,7 @@ Ox.VideoEditor = function(options, self) {
|
|||
getLargeTimelineURL: null,
|
||||
getSmallTimelineURL: null,
|
||||
'in': 0,
|
||||
height: 0,
|
||||
height: 0,
|
||||
layers: [],
|
||||
muted: false,
|
||||
out: 0,
|
||||
|
@ -1002,12 +1002,12 @@ Ox.VideoEditor = function(options, self) {
|
|||
|
||||
function getSizes(scrollbarIsVisible) {
|
||||
var scrollbarWidth = Ox.UI.SCROLLBAR_SIZE,
|
||||
contentWidth = self.options.width
|
||||
- (self.options.showAnnotations * self.options.annotationsSize) - 1
|
||||
- (scrollbarIsVisible ? scrollbarWidth : 0),
|
||||
contentWidth = self.options.width
|
||||
- (self.options.showAnnotations * self.options.annotationsSize) - 1
|
||||
- (scrollbarIsVisible ? scrollbarWidth : 0),
|
||||
height,
|
||||
lines,
|
||||
size = {
|
||||
size = {
|
||||
player: [],
|
||||
timeline: []
|
||||
},
|
||||
|
|
|
@ -304,17 +304,17 @@ Ox.VideoEditorPlayer = function(options, self) {
|
|||
if (self.options.type == 'play') {
|
||||
self.$video.position(self.options.position);
|
||||
} else {
|
||||
self.$loadingIcon && self.$loadingIcon.stop();
|
||||
self.$loadingIcon && self.$loadingIcon.stop();
|
||||
url = self.options.url(position);
|
||||
if (self.$video.attr('src') != url) {
|
||||
self.$loadingIcon = Ox.LoadingIcon()
|
||||
if (self.$video.attr('src') != url) {
|
||||
self.$loadingIcon = Ox.LoadingIcon()
|
||||
.appendTo(that)
|
||||
.start();
|
||||
self.$video.attr({
|
||||
src: url
|
||||
})
|
||||
.load(self.$loadingIcon.stop);
|
||||
}
|
||||
}
|
||||
}
|
||||
setMarkers();
|
||||
setSubtitle();
|
||||
|
|
|
@ -738,7 +738,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
|
|||
function setWidth() {
|
||||
self.contentWidth = self.options.width - 2 * self.margin;
|
||||
self.lines = getLines();
|
||||
Ox.loop(self.lines, function(i) {
|
||||
Ox.loop(self.lines, function(i) {
|
||||
if (self.$lines[i]) {
|
||||
self.$lines[i].css({
|
||||
width: self.contentWidth + 'px'
|
||||
|
|
|
@ -136,7 +136,7 @@
|
|||
Math.sin(pointA.lat) * Math.sin(pointB.lat)
|
||||
+ Math.cos(pointA.lat) * Math.cos(pointB.lat)
|
||||
* Math.cos(pointB.lng - pointA.lng)
|
||||
) * Ox.EARTH_RADIUS;
|
||||
) * Ox.EARTH_RADIUS;
|
||||
};
|
||||
|
||||
/*@
|
||||
|
|
|
@ -421,7 +421,7 @@
|
|||
+ code.trim().replace(/</g, '<') + '</code>'
|
||||
);
|
||||
return salt.join(array.length - 1);
|
||||
}
|
||||
}
|
||||
)
|
||||
.replace(
|
||||
/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,
|
||||
|
|
Loading…
Reference in a new issue