forked from railsadminteam/rails_admin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/easily_replace_sidebar_navigation
Conflicts: app/views/layouts/rails_admin/application.html.haml
- Loading branch information
Showing
226 changed files
with
10,750 additions
and
7,062 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
173 changes: 99 additions & 74 deletions
173
app/assets/javascripts/rails_admin/bootstrap/bootstrap-affix.js
100755 → 100644
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +1,142 @@ | ||
| /* ========================================================== | ||
| * bootstrap-affix.js v2.3.2 | ||
| * http://getbootstrap.com/2.3.2/javascript.html#affix | ||
| * ========================================================== | ||
| * Copyright 2012 Twitter, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * ========================================================== */ | ||
|
|
||
|
|
||
| !function ($) { | ||
|
|
||
| "use strict"; // jshint ;_; | ||
|
|
||
|
|
||
| /* AFFIX CLASS DEFINITION | ||
| * ====================== */ | ||
| /* ======================================================================== | ||
| * Bootstrap: affix.js v3.2.0 | ||
| * http://getbootstrap.com/javascript/#affix | ||
| * ======================================================================== | ||
| * Copyright 2011-2014 Twitter, Inc. | ||
| * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) | ||
| * ======================================================================== */ | ||
|
|
||
|
|
||
| +function ($) { | ||
| 'use strict'; | ||
|
|
||
| // AFFIX CLASS DEFINITION | ||
| // ====================== | ||
|
|
||
| var Affix = function (element, options) { | ||
| this.options = $.extend({}, $.fn.affix.defaults, options) | ||
| this.$window = $(window) | ||
| .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) | ||
| .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) | ||
| this.$element = $(element) | ||
| this.options = $.extend({}, Affix.DEFAULTS, options) | ||
|
|
||
| this.$target = $(this.options.target) | ||
| .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) | ||
| .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) | ||
|
|
||
| this.$element = $(element) | ||
| this.affixed = | ||
| this.unpin = | ||
| this.pinnedOffset = null | ||
|
|
||
| this.checkPosition() | ||
| } | ||
|
|
||
| Affix.VERSION = '3.2.0' | ||
|
|
||
| Affix.RESET = 'affix affix-top affix-bottom' | ||
|
|
||
| Affix.DEFAULTS = { | ||
| offset: 0, | ||
| target: window | ||
| } | ||
|
|
||
| Affix.prototype.getPinnedOffset = function () { | ||
| if (this.pinnedOffset) return this.pinnedOffset | ||
| this.$element.removeClass(Affix.RESET).addClass('affix') | ||
| var scrollTop = this.$target.scrollTop() | ||
| var position = this.$element.offset() | ||
| return (this.pinnedOffset = position.top - scrollTop) | ||
| } | ||
|
|
||
| Affix.prototype.checkPositionWithEventLoop = function () { | ||
| setTimeout($.proxy(this.checkPosition, this), 1) | ||
| } | ||
|
|
||
| Affix.prototype.checkPosition = function () { | ||
| if (!this.$element.is(':visible')) return | ||
|
|
||
| var scrollHeight = $(document).height() | ||
| , scrollTop = this.$window.scrollTop() | ||
| , position = this.$element.offset() | ||
| , offset = this.options.offset | ||
| , offsetBottom = offset.bottom | ||
| , offsetTop = offset.top | ||
| , reset = 'affix affix-top affix-bottom' | ||
| , affix | ||
|
|
||
| if (typeof offset != 'object') offsetBottom = offsetTop = offset | ||
| if (typeof offsetTop == 'function') offsetTop = offset.top() | ||
| if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() | ||
|
|
||
| affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? | ||
| false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? | ||
| 'bottom' : offsetTop != null && scrollTop <= offsetTop ? | ||
| 'top' : false | ||
| var scrollTop = this.$target.scrollTop() | ||
| var position = this.$element.offset() | ||
| var offset = this.options.offset | ||
| var offsetTop = offset.top | ||
| var offsetBottom = offset.bottom | ||
|
|
||
| if (typeof offset != 'object') offsetBottom = offsetTop = offset | ||
| if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) | ||
| if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) | ||
|
|
||
| var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : | ||
| offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : | ||
| offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false | ||
|
|
||
| if (this.affixed === affix) return | ||
| if (this.unpin != null) this.$element.css('top', '') | ||
|
|
||
| this.affixed = affix | ||
| this.unpin = affix == 'bottom' ? position.top - scrollTop : null | ||
| var affixType = 'affix' + (affix ? '-' + affix : '') | ||
| var e = $.Event(affixType + '.bs.affix') | ||
|
|
||
| this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) | ||
| } | ||
| this.$element.trigger(e) | ||
|
|
||
| if (e.isDefaultPrevented()) return | ||
|
|
||
| /* AFFIX PLUGIN DEFINITION | ||
| * ======================= */ | ||
| this.affixed = affix | ||
| this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null | ||
|
|
||
| this.$element | ||
| .removeClass(Affix.RESET) | ||
| .addClass(affixType) | ||
| .trigger($.Event(affixType.replace('affix', 'affixed'))) | ||
|
|
||
| if (affix == 'bottom') { | ||
| this.$element.offset({ | ||
| top: scrollHeight - this.$element.height() - offsetBottom | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| var old = $.fn.affix | ||
|
|
||
| $.fn.affix = function (option) { | ||
| // AFFIX PLUGIN DEFINITION | ||
| // ======================= | ||
|
|
||
| function Plugin(option) { | ||
| return this.each(function () { | ||
| var $this = $(this) | ||
| , data = $this.data('affix') | ||
| , options = typeof option == 'object' && option | ||
| if (!data) $this.data('affix', (data = new Affix(this, options))) | ||
| var $this = $(this) | ||
| var data = $this.data('bs.affix') | ||
| var options = typeof option == 'object' && option | ||
|
|
||
| if (!data) $this.data('bs.affix', (data = new Affix(this, options))) | ||
| if (typeof option == 'string') data[option]() | ||
| }) | ||
| } | ||
|
|
||
| $.fn.affix.Constructor = Affix | ||
| var old = $.fn.affix | ||
|
|
||
| $.fn.affix.defaults = { | ||
| offset: 0 | ||
| } | ||
| $.fn.affix = Plugin | ||
| $.fn.affix.Constructor = Affix | ||
|
|
||
|
|
||
| /* AFFIX NO CONFLICT | ||
| * ================= */ | ||
| // AFFIX NO CONFLICT | ||
| // ================= | ||
|
|
||
| $.fn.affix.noConflict = function () { | ||
| $.fn.affix = old | ||
| return this | ||
| } | ||
|
|
||
|
|
||
| /* AFFIX DATA-API | ||
| * ============== */ | ||
| // AFFIX DATA-API | ||
| // ============== | ||
|
|
||
| $(window).on('load', function () { | ||
| $('[data-spy="affix"]').each(function () { | ||
| var $spy = $(this) | ||
| , data = $spy.data() | ||
| var data = $spy.data() | ||
|
|
||
| data.offset = data.offset || {} | ||
|
|
||
| data.offsetBottom && (data.offset.bottom = data.offsetBottom) | ||
| data.offsetTop && (data.offset.top = data.offsetTop) | ||
| if (data.offsetBottom) data.offset.bottom = data.offsetBottom | ||
| if (data.offsetTop) data.offset.top = data.offsetTop | ||
|
|
||
| $spy.affix(data) | ||
| Plugin.call($spy, data) | ||
| }) | ||
| }) | ||
|
|
||
|
|
||
| }(window.jQuery); | ||
| }(jQuery); |
Oops, something went wrong.