diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 4c225308..096ea693 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -8,8 +8,9 @@ module TodosHelper end def form_remote_tag_edit_todo( &block ) - form_tag( - todo_path(@todo), { + form_remote_tag( + :url => todo_path(@todo), + :html => { :method => :put, :id => dom_id(@todo, 'form'), :class => dom_id(@todo, 'form') + " inline-form edit_todo_form" }, @@ -29,7 +30,7 @@ module TodosHelper :method => 'get', :with => "'#{parameters}'", :before => todo_start_waiting_js(todo), - :complete => todo_stop_waiting_js) + :complete => todo_stop_waiting_js(todo)) end def remote_delete_menu_item(parameters, todo) @@ -39,7 +40,7 @@ module TodosHelper :method => 'delete', :with => "'#{parameters}'", :before => todo_start_waiting_js(todo), - :complete => todo_stop_waiting_js) + :complete => todo_stop_waiting_js(todo)) end def remote_defer_menu_item(days, todo) @@ -58,16 +59,16 @@ module TodosHelper image_tag("defer_#{days}_off.png", :mouseover => "defer_#{days}.png", :alt => "", :align => "absmiddle")+" Defer #{pluralize(days, "day")}", :url => url, :before => todo_start_waiting_js(todo), - :complete => todo_stop_waiting_js) + :complete => todo_stop_waiting_js(todo)) end end def todo_start_waiting_js(todo) - return "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()" + return "$('#ul#{dom_id(todo)}').css('visibility', 'hidden'); $('##{dom_id(todo)}').block({message: null})" end - def todo_stop_waiting_js - return "itemContainer.stopWaiting();" + def todo_stop_waiting_js(todo) + return "$('##{dom_id(todo)}').unblock();" end def image_tag_for_recurring_todo(todo) diff --git a/app/views/contexts/_context.rhtml b/app/views/contexts/_context.rhtml index fb92dc2b..b5470a8d 100644 --- a/app/views/contexts/_context.rhtml +++ b/app/views/contexts/_context.rhtml @@ -3,25 +3,6 @@

<% if collapsible -%> <%= image_tag("collapse.png") %> - <% apply_behavior '.container_toggle:click', :prevent_default => true do |page| - page << " /* only handle the click if a previous click had finished its animation */ - if (todoItems.lastEffect == null || todoItems.lastEffect.state=='finished') { - containerElem = this.up('.container') - toggleTarget = containerElem.down('.toggle_target') - if (Element.visible(toggleTarget)) - { - todoItems.collapseNextActionListing(toggleTarget); - $.cookie(todoItems.buildCookieName(containerElem), true); - } - else - { - todoItems.expandNextActionListing(toggleTarget); - $.cookie(todoItems.buildCookieName(containerElem), null); - } - } - " - end - -%> <% end -%> <% if source_view_is :context %> <%= context.name %> diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb index 02480e6f..5dbdb4d1 100644 --- a/app/views/layouts/standard.html.erb +++ b/app/views/layouts/standard.html.erb @@ -13,12 +13,12 @@ <%= javascript_include_tag 'jquery' %> <%= javascript_include_tag 'jquery-ui' %> <%= javascript_include_tag 'jquery.cookie' %> + <%= javascript_include_tag 'jquery.blockUI' %> <% end %> <% bundle :name => "tracks_js" do %> <%= javascript_include_tag *%w[ hoverIntent superfish application - accesskey-hints niftycube - protoload flashobject ] %> + accesskey-hints niftycube flashobject ] %> <% end %> <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> <%= javascript_tag "var SOURCE_VIEW = '#{@source_view}';" %> diff --git a/app/views/shared/_add_new_item_form.rhtml b/app/views/shared/_add_new_item_form.rhtml index 22fff1ac..92122405 100644 --- a/app/views/shared/_add_new_item_form.rhtml +++ b/app/views/shared/_add_new_item_form.rhtml @@ -9,12 +9,6 @@
« Hide form - <% apply_behavior '#toggle_action_new a:click', :prevent_default => true do |page| - page << "TracksForm.toggle('toggle_action_new', 'todo_new_action', 'todo-form-new-action', - '« Hide form', 'Hide next action form', - 'Add a next action »', 'Add a next action');" - end - -%>
diff --git a/app/views/todos/_edit_form.rhtml b/app/views/todos/_edit_form.rhtml index 1e1786e6..e471984e 100644 --- a/app/views/todos/_edit_form.rhtml +++ b/app/views/todos/_edit_form.rhtml @@ -14,42 +14,12 @@ " /> - -
- -
@@ -86,20 +56,9 @@ <%=image_tag("accept.png", :alt => "") %> Update - + <%=image_tag("cancel.png", :alt => "") %> Cancel - -<%= calendar_setup( dom_id(@todo, 'due') ) %> -<%= calendar_setup( dom_id(@todo, 'show_from') ) %> - - \ No newline at end of file diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb index 2de2c5c5..4d2ad947 100644 --- a/app/views/todos/_todo.html.erb +++ b/app/views/todos/_todo.html.erb @@ -8,7 +8,7 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag' @z_index_counter = @z_index_counter - 1 # for IE z-index bug %>
-
+
<%= remote_star_icon %> <%= remote_toggle_checkbox unless source_view_is :deferred %>
  • <%= image_tag "downarrow.png", :alt=> "" %>
      @@ -37,4 +37,4 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
      <% end -%>
-
\ No newline at end of file +
diff --git a/app/views/todos/edit.js.rjs b/app/views/todos/edit.js.rjs index 9e57e85c..20f7e290 100644 --- a/app/views/todos/edit.js.rjs +++ b/app/views/todos/edit.js.rjs @@ -1,4 +1,4 @@ -page[dom_id(@todo, 'form')].down('.placeholder').replace_html :partial => 'todos/edit_form' -page[dom_id(@todo, 'line')].hide +page[dom_id(@todo, 'form')].find('.placeholder').show().replace_html :partial => 'todos/edit_form' page[dom_id(@todo, 'edit')].show -page[dom_id(@todo, 'form')].down('input#todo_description').focus \ No newline at end of file +page[dom_id(@todo, 'line')].hide +page[dom_id(@todo, 'form')].find('input#todo_description').show().focus diff --git a/public/javascripts/application.js b/public/javascripts/application.js index a44f9dcf..e61fb90c 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -210,8 +210,7 @@ function setup_container_toggles(){ $(document).ready(function() { /* fade flashes and alerts in automatically */ - $(".alert").fadeIn(8000); - $('#flash:visible').fadeIn(5000); + $(".alert").fadeOut(5000); /* set behavior for star icon */ $(".item-container a.star_item"). @@ -224,4 +223,20 @@ $(document).ready(function() { setup_container_toggles(); $('input.Date').datepicker(); + + $('#toggle_action_new').click(function(){ + TracksForm.toggle('toggle_action_new', 'todo_new_action', 'todo-form-new-action', + '« Hide form', 'Hide next action form', + 'Add a next action »', 'Add a next action'); + }); + + $('.edit-form a.negative').live('click', function(){ + $(this).parents('.container').find('.item-show').show(); + $(this).parents('.edit-form').hide(); + }); + + $(".date_clear").live('click', function() { + /* add behavior to clear the date both buttons for show_from and due */ + $(this).prev().val(''); + }) }); diff --git a/public/javascripts/jquery.blockUI.js b/public/javascripts/jquery.blockUI.js new file mode 100644 index 00000000..3116d08c --- /dev/null +++ b/public/javascripts/jquery.blockUI.js @@ -0,0 +1,462 @@ +/*! + * jQuery blockUI plugin + * Version 2.25 (29-AUG-2009) + * @requires jQuery v1.2.3 or later + * + * Examples at: http://malsup.com/jquery/block/ + * Copyright (c) 2007-2008 M. Alsup + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Thanks to Amir-Hossein Sobhi for some excellent contributions! + */ + +;(function($) { + +if (/1\.(0|1|2)\.(0|1|2)/.test($.fn.jquery) || /^1.1/.test($.fn.jquery)) { + alert('blockUI requires jQuery v1.2.3 or later! You are using v' + $.fn.jquery); + return; +} + +$.fn._fadeIn = $.fn.fadeIn; + +// this bit is to ensure we don't call setExpression when we shouldn't (with extra muscle to handle +// retarded userAgent strings on Vista) +var mode = document.documentMode || 0; +var setExpr = $.browser.msie && (($.browser.version < 8 && !mode) || mode < 8); +var ie6 = $.browser.msie && /MSIE 6.0/.test(navigator.userAgent) && !mode; + +// global $ methods for blocking/unblocking the entire page +$.blockUI = function(opts) { install(window, opts); }; +$.unblockUI = function(opts) { remove(window, opts); }; + +// convenience method for quick growl-like notifications (http://www.google.com/search?q=growl) +$.growlUI = function(title, message, timeout, onClose) { + var $m = $('
'); + if (title) $m.append('

'+title+'

'); + if (message) $m.append('

'+message+'

'); + if (timeout == undefined) timeout = 3000; + $.blockUI({ + message: $m, fadeIn: 700, fadeOut: 1000, centerY: false, + timeout: timeout, showOverlay: false, + onUnblock: onClose, + css: $.blockUI.defaults.growlCSS + }); +}; + +// plugin method for blocking element content +$.fn.block = function(opts) { + return this.unblock({ fadeOut: 0 }).each(function() { + if ($.css(this,'position') == 'static') + this.style.position = 'relative'; + if ($.browser.msie) + this.style.zoom = 1; // force 'hasLayout' + install(this, opts); + }); +}; + +// plugin method for unblocking element content +$.fn.unblock = function(opts) { + return this.each(function() { + remove(this, opts); + }); +}; + +$.blockUI.version = 2.25; // 2nd generation blocking at no extra cost! + +// override these in your code to change the default behavior and style +$.blockUI.defaults = { + // message displayed when blocking (use null for no message) + message: '

Please wait...

', + + title: null, // title string; only used when theme == true + draggable: true, // only used when theme == true (requires jquery-ui.js to be loaded) + + theme: false, // set to true to use with jQuery UI themes + + // styles for the message when blocking; if you wish to disable + // these and use an external stylesheet then do this in your code: + // $.blockUI.defaults.css = {}; + css: { + padding: 0, + margin: 0, + width: '30%', + top: '40%', + left: '35%', + textAlign: 'center', + color: '#000', + border: '3px solid #aaa', + backgroundColor:'#fff', + cursor: 'wait' + }, + + // minimal style set used when themes are used + themedCSS: { + width: '30%', + top: '40%', + left: '35%' + }, + + // styles for the overlay + overlayCSS: { + opacity: 0.6, + cursor: 'wait' + }, + + // styles applied when using $.growlUI + growlCSS: { + width: '350px', + top: '10px', + left: '', + right: '10px', + border: 'none', + padding: '5px', + opacity: 0.6, + cursor: null, + color: '#fff', + backgroundColor: '#000', + '-webkit-border-radius': '10px', + '-moz-border-radius': '10px' + }, + + // IE issues: 'about:blank' fails on HTTPS and javascript:false is s-l-o-w + // (hat tip to Jorge H. N. de Vasconcelos) + iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank', + + // force usage of iframe in non-IE browsers (handy for blocking applets) + forceIframe: false, + + // z-index for the blocking overlay + baseZ: 1000, + + // set these to true to have the message automatically centered + centerX: true, // <-- only effects element blocking (page block controlled via css above) + centerY: true, + + // allow body element to be stetched in ie6; this makes blocking look better + // on "short" pages. disable if you wish to prevent changes to the body height + allowBodyStretch: true, + + // enable if you want key and mouse events to be disabled for content that is blocked + bindEvents: true, + + // be default blockUI will supress tab navigation from leaving blocking content + // (if bindEvents is true) + constrainTabKey: true, + + // fadeIn time in millis; set to 0 to disable fadeIn on block + fadeIn: 200, + + // fadeOut time in millis; set to 0 to disable fadeOut on unblock + fadeOut: 400, + + // time in millis to wait before auto-unblocking; set to 0 to disable auto-unblock + timeout: 0, + + // disable if you don't want to show the overlay + showOverlay: true, + + // if true, focus will be placed in the first available input field when + // page blocking + focusInput: true, + + // suppresses the use of overlay styles on FF/Linux (due to performance issues with opacity) + applyPlatformOpacityRules: true, + + // callback method invoked when unblocking has completed; the callback is + // passed the element that has been unblocked (which is the window object for page + // blocks) and the options that were passed to the unblock call: + // onUnblock(element, options) + onUnblock: null, + + // don't ask; if you really must know: http://groups.google.com/group/jquery-en/browse_thread/thread/36640a8730503595/2f6a79a77a78e493#2f6a79a77a78e493 + quirksmodeOffsetHack: 4 +}; + +// private data and functions follow... + +var pageBlock = null; +var pageBlockEls = []; + +function install(el, opts) { + var full = (el == window); + var msg = opts && opts.message !== undefined ? opts.message : undefined; + opts = $.extend({}, $.blockUI.defaults, opts || {}); + opts.overlayCSS = $.extend({}, $.blockUI.defaults.overlayCSS, opts.overlayCSS || {}); + var css = $.extend({}, $.blockUI.defaults.css, opts.css || {}); + var themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {}); + msg = msg === undefined ? opts.message : msg; + + // remove the current block (if there is one) + if (full && pageBlock) + remove(window, {fadeOut:0}); + + // if an existing element is being used as the blocking content then we capture + // its current place in the DOM (and current display style) so we can restore + // it when we unblock + if (msg && typeof msg != 'string' && (msg.parentNode || msg.jquery)) { + var node = msg.jquery ? msg[0] : msg; + var data = {}; + $(el).data('blockUI.history', data); + data.el = node; + data.parent = node.parentNode; + data.display = node.style.display; + data.position = node.style.position; + if (data.parent) + data.parent.removeChild(node); + } + + var z = opts.baseZ; + + // blockUI uses 3 layers for blocking, for simplicity they are all used on every platform; + // layer1 is the iframe layer which is used to supress bleed through of underlying content + // layer2 is the overlay layer which has opacity and a wait cursor (by default) + // layer3 is the message content that is displayed while blocking + + var lyr1 = ($.browser.msie || opts.forceIframe) + ? $('') + : $(''); + var lyr2 = $(''); + + var lyr3; + if (opts.theme && full) { + var s = ''; + lyr3 = $(s); + } + else { + lyr3 = full ? $('') + : $(''); + } + + // if we have a message, style it + if (msg) { + if (opts.theme) { + lyr3.css(themedCSS); + lyr3.addClass('ui-widget-content'); + } + else + lyr3.css(css); + } + + // style the overlay + if (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform))) + lyr2.css(opts.overlayCSS); + lyr2.css('position', full ? 'fixed' : 'absolute'); + + // make iframe layer transparent in IE + if ($.browser.msie || opts.forceIframe) + lyr1.css('opacity',0.0); + + $([lyr1[0],lyr2[0],lyr3[0]]).appendTo(full ? 'body' : el); + + if (opts.theme && opts.draggable && $.fn.draggable) { + lyr3.draggable({ + handle: '.ui-dialog-titlebar', + cancel: 'li' + }); + } + + // ie7 must use absolute positioning in quirks mode and to account for activex issues (when scrolling) + var expr = setExpr && (!$.boxModel || $('object,embed', full ? null : el).length > 0); + if (ie6 || expr) { + // give body 100% height + if (full && opts.allowBodyStretch && $.boxModel) + $('html,body').css('height','100%'); + + // fix ie6 issue when blocked element has a border width + if ((ie6 || !$.boxModel) && !full) { + var t = sz(el,'borderTopWidth'), l = sz(el,'borderLeftWidth'); + var fixT = t ? '(0 - '+t+')' : 0; + var fixL = l ? '(0 - '+l+')' : 0; + } + + // simulate fixed position + $.each([lyr1,lyr2,lyr3], function(i,o) { + var s = o[0].style; + s.position = 'absolute'; + if (i < 2) { + full ? s.setExpression('height','Math.max(document.body.scrollHeight, document.body.offsetHeight) - (jQuery.boxModel?0:'+opts.quirksmodeOffsetHack+') + "px"') + : s.setExpression('height','this.parentNode.offsetHeight + "px"'); + full ? s.setExpression('width','jQuery.boxModel && document.documentElement.clientWidth || document.body.clientWidth + "px"') + : s.setExpression('width','this.parentNode.offsetWidth + "px"'); + if (fixL) s.setExpression('left', fixL); + if (fixT) s.setExpression('top', fixT); + } + else if (opts.centerY) { + if (full) s.setExpression('top','(document.documentElement.clientHeight || document.body.clientHeight) / 2 - (this.offsetHeight / 2) + (blah = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + "px"'); + s.marginTop = 0; + } + else if (!opts.centerY && full) { + var top = (opts.css && opts.css.top) ? parseInt(opts.css.top) : 0; + var expression = '((document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop) + '+top+') + "px"'; + s.setExpression('top',expression); + } + }); + } + + // show the message + if (msg) { + if (opts.theme) + lyr3.find('.ui-widget-content').append(msg); + else + lyr3.append(msg); + if (msg.jquery || msg.nodeType) + $(msg).show(); + } + + if (($.browser.msie || opts.forceIframe) && opts.showOverlay) + lyr1.show(); // opacity is zero + if (opts.fadeIn) { + if (opts.showOverlay) + lyr2._fadeIn(opts.fadeIn); + if (msg) + lyr3.fadeIn(opts.fadeIn); + } + else { + if (opts.showOverlay) + lyr2.show(); + if (msg) + lyr3.show(); + } + + // bind key and mouse events + bind(1, el, opts); + + if (full) { + pageBlock = lyr3[0]; + pageBlockEls = $(':input:enabled:visible',pageBlock); + if (opts.focusInput) + setTimeout(focus, 20); + } + else + center(lyr3[0], opts.centerX, opts.centerY); + + if (opts.timeout) { + // auto-unblock + var to = setTimeout(function() { + full ? $.unblockUI(opts) : $(el).unblock(opts); + }, opts.timeout); + $(el).data('blockUI.timeout', to); + } +}; + +// remove the block +function remove(el, opts) { + var full = (el == window); + var $el = $(el); + var data = $el.data('blockUI.history'); + var to = $el.data('blockUI.timeout'); + if (to) { + clearTimeout(to); + $el.removeData('blockUI.timeout'); + } + opts = $.extend({}, $.blockUI.defaults, opts || {}); + bind(0, el, opts); // unbind events + + var els; + if (full) // crazy selector to handle odd field errors in ie6/7 + els = $('body').children().filter('.blockUI').add('body > .blockUI'); + else + els = $('.blockUI', el); + + if (full) + pageBlock = pageBlockEls = null; + + if (opts.fadeOut) { + els.fadeOut(opts.fadeOut); + setTimeout(function() { reset(els,data,opts,el); }, opts.fadeOut); + } + else + reset(els, data, opts, el); +}; + +// move blocking element back into the DOM where it started +function reset(els,data,opts,el) { + els.each(function(i,o) { + // remove via DOM calls so we don't lose event handlers + if (this.parentNode) + this.parentNode.removeChild(this); + }); + + if (data && data.el) { + data.el.style.display = data.display; + data.el.style.position = data.position; + if (data.parent) + data.parent.appendChild(data.el); + $(data.el).removeData('blockUI.history'); + } + + if (typeof opts.onUnblock == 'function') + opts.onUnblock(el,opts); +}; + +// bind/unbind the handler +function bind(b, el, opts) { + var full = el == window, $el = $(el); + + // don't bother unbinding if there is nothing to unbind + if (!b && (full && !pageBlock || !full && !$el.data('blockUI.isBlocked'))) + return; + if (!full) + $el.data('blockUI.isBlocked', b); + + // don't bind events when overlay is not in use or if bindEvents is false + if (!opts.bindEvents || (b && !opts.showOverlay)) + return; + + // bind anchors and inputs for mouse and key events + var events = 'mousedown mouseup keydown keypress'; + b ? $(document).bind(events, opts, handler) : $(document).unbind(events, handler); + +// former impl... +// var $e = $('a,:input'); +// b ? $e.bind(events, opts, handler) : $e.unbind(events, handler); +}; + +// event handler to suppress keyboard/mouse events when blocking +function handler(e) { + // allow tab navigation (conditionally) + if (e.keyCode && e.keyCode == 9) { + if (pageBlock && e.data.constrainTabKey) { + var els = pageBlockEls; + var fwd = !e.shiftKey && e.target == els[els.length-1]; + var back = e.shiftKey && e.target == els[0]; + if (fwd || back) { + setTimeout(function(){focus(back)},10); + return false; + } + } + } + // allow events within the message content + if ($(e.target).parents('div.blockMsg').length > 0) + return true; + + // allow events for content that is not being blocked + return $(e.target).parents().children().filter('div.blockUI').length == 0; +}; + +function focus(back) { + if (!pageBlockEls) + return; + var e = pageBlockEls[back===true ? pageBlockEls.length-1 : 0]; + if (e) + e.focus(); +}; + +function center(el, x, y) { + var p = el.parentNode, s = el.style; + var l = ((p.offsetWidth - el.offsetWidth)/2) - sz(p,'borderLeftWidth'); + var t = ((p.offsetHeight - el.offsetHeight)/2) - sz(p,'borderTopWidth'); + if (x) s.left = l > 0 ? (l+'px') : '0'; + if (y) s.top = t > 0 ? (t+'px') : '0'; +}; + +function sz(el, p) { + return parseInt($.css(el,p))||0; +}; + +})(jQuery); diff --git a/public/javascripts/protoload.js b/public/javascripts/protoload.js deleted file mode 100644 index c49215ce..00000000 --- a/public/javascripts/protoload.js +++ /dev/null @@ -1,77 +0,0 @@ -/* protoload 0.1 beta by Andreas Kalsch - * last change: 09.07.2007 - * - * This simple piece of code automates the creating of Ajax loading symbols. - * The loading symbol covers an HTML element with correct position and size - example: - * $('myElement').startWaiting() and $('myElement').stopWaiting() - */ - -Protoload = { - // the script to wait this amount of msecs until it shows the loading element - timeUntilShow: 250, - - // opacity of loading element - opacity: 0.8, - - // Start waiting status - show loading element - startWaiting: function(element, className, timeUntilShow) { - if (typeof element == 'string') - element = document.getElementById(element); - if (className == undefined) - className = 'tracks__waiting'; - if (timeUntilShow == undefined) - timeUntilShow = Protoload.timeUntilShow; - - element._waiting = true; - if (!element._loading) { - var e = document.createElement('div'); - (element.offsetParent || document.body).appendChild(element._loading = e); - e.style.position = 'absolute'; - try {e.style.opacity = Protoload.opacity;} catch(e) {} - try {e.style.MozOpacity = Protoload.opacity;} catch(e) {} - try {e.style.filter = 'alpha(opacity='+Math.round(Protoload.opacity * 100)+')';} catch(e) {} - try {e.style.KhtmlOpacity = Protoload.opacity;} catch(e) {} - - /*var zIndex = 0; - if (window.UI) - if (UI.zIndex) - zIndex = ++UI.zIndex; - if (!zIndex) - zIndex = ++Protoload._zIndex; - e.style.zIndex = zIndex;*/ - } - element._loading.className = className; - window.setTimeout((function() { - if (this._waiting) { - var left = this.offsetLeft, - top = this.offsetTop, - width = this.offsetWidth, - height = this.offsetHeight, - l = this._loading; - - l.style.left = left+'px'; - l.style.top = top+'px'; - l.style.width = width+'px'; - l.style.height = height+'px'; - l.style.display = 'inline'; - } - }).bind(element), timeUntilShow); - }, - - // Get current waiting status - isWaiting: function(element) { - return element._waiting == true; - }, - - // Stop waiting status - hide loading element - stopWaiting: function(element) { - if (element._waiting) { - element._waiting = false; - element._loading.parentNode.removeChild(element._loading); - element._loading = null; - } - }/*, - - _zIndex: 1000000*/ -}; - diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css index 218be620..699f6b3e 100644 --- a/public/stylesheets/standard.css +++ b/public/stylesheets/standard.css @@ -1178,7 +1178,7 @@ button.positive, .widgets a.positive{ border:1px solid #d12f19; color:#fff; } -.tracks__waiting { +.blockUI.blockOverlay { background-image:url('/images/waiting.gif'); background-repeat:no-repeat; background-position:center center;