app/assets/javascripts/mercury/palette.js.coffee in mercury-rails-0.1.1 vs app/assets/javascripts/mercury/palette.js.coffee in mercury-rails-0.1.2
- old
+ new
@@ -3,12 +3,12 @@
constructor: (@url, @name, @options = {}) ->
super
build: ->
- @element = $('<div>', {class: "mercury-palette mercury-#{@name}-palette loading", style: 'display:none'})
- @element.appendTo($(@options.appendTo).get(0) ? 'body')
+ @element = jQuery('<div>', {class: "mercury-palette mercury-#{@name}-palette loading", style: 'display:none'})
+ @element.appendTo(jQuery(@options.appendTo).get(0) ? 'body')
bindEvents: ->
Mercury.bind 'hide:dialogs', (event, dialog) => @hide() unless dialog == @
super
@@ -17,13 +17,13 @@
position: (keepVisible) ->
@element.css({top: 0, left: 0, display: 'block', visibility: 'hidden'})
position = @button.offset()
width = @element.width()
- position.left = position.left - width + @button.width() if position.left + width > $(window).width()
+ position.left = position.left - width + @button.width() if position.left + width > jQuery(window).width()
@element.css {
- top: position.top + @button.height(),
- left: position.left,
- display: if keepVisible then 'block' else 'none',
+ top: position.top + @button.height()
+ left: position.left
+ display: if keepVisible then 'block' else 'none'
visibility: 'visible'
}