github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

r.ui.Bubble: Default to anchor-right logic.

Browse Source
This commit is contained in:
Andre D
2014-01-16 15:51:59 -05:00
committed by Keith Mitchell
parent 2379a24f53
commit 86265bfe48
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
r2/r2/public/static/js/ui.js
View File

@@ -192,14 +192,6 @@ r.ui.Bubble = Backbone.View.extend({
left: parentPos.left,
top: parentPos.top + offsetY - bodyOffset.top
})
} else if (this.$el.is('.anchor-right')) {
offsetX = 16
offsetY = 0
parentPos.right = $(window).width() - parentPos.left
this.$el.css({
right: parentPos.right + offsetX,
top: parentPos.top + offsetY - bodyOffset.top
})
} else if (this.$el.is('.anchor-right-fixed')) {
offsetX = 32
offsetY = 0
@@ -218,6 +210,14 @@ r.ui.Bubble = Backbone.View.extend({
left: parentPos.left + offsetX,
top: parentPos.top + offsetY - bodyOffset.top
})
} else { // anchor-right
offsetX = 16
offsetY = 0
parentPos.right = $(window).width() - parentPos.left
this.$el.css({
right: parentPos.right + offsetX,
top: parentPos.top + offsetY - bodyOffset.top
})
}
},
@@ -281,15 +281,15 @@ r.ui.Bubble = Backbone.View.extend({
if (this.$el.is('.anchor-top') || this.$el.is('.anchor-top-centered') || this.$el.is('.anchor-top-left')) {
animProp = 'top'
animOffset = '-=5'
} else if (this.$el.is('.anchor-right')) {
animProp = 'right'
animOffset = '-=5'
} else if (this.$el.is('.anchor-right-fixed')) {
animProp = 'right'
animOffset = '-=5'
} else if (this.$el.is('.anchor-left')) {
animProp = 'left'
animOffset = '+=5'
} else { // anchor-right
animProp = 'right'
animOffset = '-=5'
}
var curOffset = this.$el.css(animProp)