spec/dummy_app/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 in basepack-0.0.2 vs spec/dummy_app/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994 in basepack-0.1.0

- old
+ new

@@ -1,10 +1,10 @@ {I" class:ETI"BundledAsset;FI"logical_path;TI"application.js;TI" pathname;TI"0$root/app/assets/javascripts/application.js;FI"content_type;TI"application/javascript;TI" -mtime;Tl+ƒx½RI" length;Ti¨ - I" digest;TI"%8fc3fbb286892b1e34665176d6d6683f;FI" source;TI"¨ - /*! +mtime;Tl+Š ¾RI" length;Ti + I" digest;TI"%3bbdcab6f63d2578ea3fa8175ff2c8b8;FI" source;TI" + /*! * jQuery JavaScript Library v1.10.2 * http://jquery.com/ * * Includes Sizzle.js * http://sizzlejs.com/ @@ -22258,11 +22258,11 @@ /* =========================================================== - * bootstrap-modalmanager.js v2.1 + * bootstrap-modalmanager.js v2.2.0 * =========================================================== * Copyright 2012 Jordan Schroter. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22339,11 +22339,10 @@ modal.$container = that.createContainer(modal); modal.$element.appendTo(modal.$container); that.backdrop(modal, function () { - modal.$element.show(); if (transition) { //modal.$element[0].style.display = 'run-in'; modal.$element[0].offsetWidth; @@ -22373,12 +22372,16 @@ })); modal.$element.on('hidden.modalmanager', targetIsSelf(function (e) { that.backdrop(modal); - if (modal.$backdrop){ + var transition = $.support.transition && modal.$element.hasClass('fade'); + + // trigger a relayout due to firebox's buggy transition end event + if (transition) { modal.$element[0].offsetWidth; } + $.support.transition && modal.$element.hasClass('fade') ? modal.$backdrop.one($.support.transition.end, function () { that.destroyModal(modal) }) : that.destroyModal(modal); } else { that.destroyModal(modal); @@ -22391,11 +22394,10 @@ })); }, destroyModal: function (modal) { - modal.destroy(); var hasOpenModal = this.hasOpenModal(); this.$element.toggleClass('modal-open', hasOpenModal); @@ -22407,18 +22409,23 @@ this.removeContainer(modal); this.setFocus(); }, - hasOpenModal: function () { + getOpenModals: function () { + var openModals = []; for (var i = 0; i < this.stack.length; i++){ - if (this.stack[i].isShown) return true; + if (this.stack[i].isShown) openModals.push(this.stack[i]); } - return false; + return openModals; }, + hasOpenModal: function () { + return this.getOpenModals().length > 0; + }, + setFocus: function () { var topModal; for (var i = 0; i < this.stack.length; i++){ if (this.stack[i].isShown) topModal = this.stack[i]; @@ -22469,15 +22476,16 @@ removeBackdrop: function (modal) { modal.$backdrop.remove(); modal.$backdrop = null; }, - createBackdrop: function (animate) { + createBackdrop: function (animate, tmpl) { var $backdrop; if (!this.$backdropHandle) { - $backdrop = $('<div class="modal-backdrop ' + animate + '" />') + $backdrop = $(tmpl) + .addClass(animate) .appendTo(this.$element); } else { $backdrop = this.$backdropHandle; $backdrop.off('.modalmanager'); this.$backdropHandle = null; @@ -22494,12 +22502,11 @@ createContainer: function (modal) { var $container; $container = $('<div class="modal-scrollable">') - .css('z-index', getzIndex( 'modal', - modal ? this.getIndexOfModal(modal) : this.stack.length )) + .css('z-index', getzIndex('modal', this.getOpenModals().length)) .appendTo(this.$element); if (modal && modal.options.backdrop != 'static') { $container.on('click.modal', targetIsSelf(function (e) { modal.hide(); @@ -22520,13 +22527,13 @@ this.backdropCount < this.options.backdropLimit; if (modal.isShown && showBackdrop) { var doAnimate = $.support.transition && animate && !this.$backdropHandle; - modal.$backdrop = this.createBackdrop(animate); + modal.$backdrop = this.createBackdrop(animate, modal.options.backdropTemplate); - modal.$backdrop.css('z-index', getzIndex( 'backdrop', this.getIndexOfModal(modal) )); + modal.$backdrop.css('z-index', getzIndex( 'backdrop', this.getOpenModals().length )); if (doAnimate) modal.$backdrop[0].offsetWidth; // force reflow modal.$backdrop.addClass('in'); @@ -22571,20 +22578,22 @@ .toggleClass('modal-open', !this.isLoading || this.hasOpenModal()) .toggleClass('page-overflow', $(window).height() < this.$element.height()); if (!this.isLoading) { - this.$backdropHandle = this.createBackdrop('fade'); + this.$backdropHandle = this.createBackdrop('fade', this.options.backdropTemplate); this.$backdropHandle[0].offsetWidth; // force reflow + var openModals = this.getOpenModals(); + this.$backdropHandle - .css('z-index', getzIndex('backdrop', this.stack.length)) + .css('z-index', getzIndex('backdrop', openModals.length + 1)) .addClass('in'); var $spinner = $(this.options.spinner) - .css('z-index', getzIndex('modal', this.stack.length)) + .css('z-index', getzIndex('modal', openModals.length + 1)) .appendTo(this.$element) .addClass('in'); this.$spinner = $(this.createContainer()) .append($spinner) @@ -22664,11 +22673,12 @@ }; $.fn.modalmanager.defaults = { backdropLimit: 999, resize: true, - spinner: '<div class="loading-spinner fade" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>' + spinner: '<div class="loading-spinner fade" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>', + backdropTemplate: '<div class="modal-backdrop" />' }; $.fn.modalmanager.Constructor = ModalManager }(jQuery); @@ -25895,22 +25905,25 @@ (function() { - var CSRFToken, anchoredLink, browserCompatibleDocumentParser, browserIsntBuggy, browserSupportsPushState, browserSupportsTurbolinks, cacheCurrentPage, cacheSize, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, executeScriptTags, extractLink, extractTitleAndBody, fetchHistory, fetchReplacement, handleClick, ignoreClick, initializeTurbolinks, installClickHandlerLast, installDocumentReadyPageEventTriggers, installHistoryChangeHandler, installJqueryAjaxSuccessPageUpdateTrigger, loadedAssets, noTurbolink, nonHtmlLink, nonStandardClick, pageCache, pageChangePrevented, pagesCached, popCookie, processResponse, recallScrollPosition, referer, reflectNewUrl, reflectRedirectedUrl, rememberCurrentState, rememberCurrentUrl, rememberReferer, removeHash, removeHashForIE10compatiblity, removeNoscriptTags, requestMethodIsSafe, resetScrollPosition, targetLink, triggerEvent, visit, xhr, _ref, + var CSRFToken, allowLinkExtensions, anchoredLink, browserCompatibleDocumentParser, browserIsntBuggy, browserSupportsCustomEvents, browserSupportsPushState, browserSupportsTurbolinks, cacheCurrentPage, cacheSize, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, executeScriptTags, extractLink, extractTitleAndBody, fetchHistory, fetchReplacement, handleClick, historyStateIsDefined, htmlExtensions, ignoreClick, initializeTurbolinks, installClickHandlerLast, installDocumentReadyPageEventTriggers, installHistoryChangeHandler, installJqueryAjaxSuccessPageUpdateTrigger, loadedAssets, noTurbolink, nonHtmlLink, nonStandardClick, pageCache, pageChangePrevented, pagesCached, popCookie, processResponse, recallScrollPosition, referer, reflectNewUrl, reflectRedirectedUrl, rememberCurrentState, rememberCurrentUrl, rememberReferer, removeHash, removeHashForIE10compatiblity, removeNoscriptTags, requestMethodIsSafe, resetScrollPosition, targetLink, triggerEvent, visit, xhr, _ref, __hasProp = {}.hasOwnProperty, - __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }, + __slice = [].slice; pageCache = {}; cacheSize = 10; currentState = null; loadedAssets = null; + htmlExtensions = ['html']; + referer = null; createDocument = null; xhr = null; @@ -25986,23 +25999,24 @@ constrainPageCacheTo = function(limit) { var key, value; for (key in pageCache) { if (!__hasProp.call(pageCache, key)) continue; value = pageCache[key]; - if (key <= currentState.position - limit) { - pageCache[key] = null; + if (!(key <= currentState.position - limit)) { + continue; } + triggerEvent('page:expire', pageCache[key]); + pageCache[key] = null; } }; changePage = function(title, body, csrfToken, runScripts) { document.title = title; document.documentElement.replaceChild(body, document.body); if (csrfToken != null) { CSRFToken.update(csrfToken); } - removeNoscriptTags(); if (runScripts) { executeScriptTags(); } currentState = window.history.state; triggerEvent('page:change'); @@ -26028,17 +26042,13 @@ parentNode.removeChild(script); parentNode.insertBefore(copy, nextSibling); } }; - removeNoscriptTags = function() { - var noscript, noscriptTags, _i, _len; - noscriptTags = Array.prototype.slice.call(document.body.getElementsByTagName('noscript')); - for (_i = 0, _len = noscriptTags.length; _i < _len; _i++) { - noscript = noscriptTags[_i]; - noscript.parentNode.removeChild(noscript); - } + removeNoscriptTags = function(node) { + node.innerHTML = node.innerHTML.replace(/<noscript[\S\s]*?<\/noscript>/ig, ''); + return node; }; reflectNewUrl = function(url) { if (url !== referer) { return window.history.pushState({ @@ -26168,11 +26178,11 @@ }; extractTitleAndBody = function(doc) { var title; title = doc.querySelector('title'); - return [title != null ? title.textContent : void 0, doc.body, CSRFToken.get(doc).token, 'runScripts']; + return [title != null ? title.textContent : void 0, removeNoscriptTags(doc.body), CSRFToken.get(doc).token, 'runScripts']; }; CSRFToken = { get: function(doc) { var tag; @@ -26266,11 +26276,11 @@ }; nonHtmlLink = function(link) { var url; url = removeHash(link); - return url.match(/\.[a-z]+(\?.*)?$/g) && !url.match(/\.html?(\?.*)?$/g); + return url.match(/\.[a-z]+(\?.*)?$/g) && !url.match(new RegExp("\\.(?:" + (htmlExtensions.join('|')) + ")?(\\?.*)?$", 'g')); }; noTurbolink = function(link) { var ignore; while (!(ignore || link === document)) { @@ -26290,10 +26300,20 @@ ignoreClick = function(event, link) { return crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || noTurbolink(link) || targetLink(link) || nonStandardClick(event); }; + allowLinkExtensions = function() { + var extension, extensions, _i, _len; + extensions = 1 <= arguments.length ? __slice.call(arguments, 0) : []; + for (_i = 0, _len = extensions.length; _i < _len; _i++) { + extension = extensions[_i]; + htmlExtensions.push(extension); + } + return htmlExtensions; + }; + installDocumentReadyPageEventTriggers = function() { return document.addEventListener('DOMContentLoaded', (function() { triggerEvent('page:change'); return triggerEvent('page:update'); }), true); @@ -26327,21 +26347,26 @@ createDocument = browserCompatibleDocumentParser(); document.addEventListener('click', installClickHandlerLast, true); return window.addEventListener('popstate', installHistoryChangeHandler, false); }; - browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && window.history.state !== void 0; + historyStateIsDefined = window.history.state !== void 0 || navigator.userAgent.match(/Firefox\/26/); + browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && historyStateIsDefined; + browserIsntBuggy = !navigator.userAgent.match(/CriOS\//); requestMethodIsSafe = (_ref = popCookie('request_method')) === 'GET' || _ref === ''; browserSupportsTurbolinks = browserSupportsPushState && browserIsntBuggy && requestMethodIsSafe; - installDocumentReadyPageEventTriggers(); + browserSupportsCustomEvents = document.addEventListener && document.createEvent; - installJqueryAjaxSuccessPageUpdateTrigger(); + if (browserSupportsCustomEvents) { + installDocumentReadyPageEventTriggers(); + installJqueryAjaxSuccessPageUpdateTrigger(); + } if (browserSupportsTurbolinks) { visit = fetchReplacement; initializeTurbolinks(); } else { @@ -26351,10 +26376,11 @@ } this.Turbolinks = { visit: visit, pagesCached: pagesCached, + allowLinkExtensions: allowLinkExtensions, supported: browserSupportsTurbolinks }; }).call(this); // This is a manifest file that'll be compiled into application.js, which will include all the files @@ -26375,6 +26401,6 @@ ; -;TI"required_assets_digest;TI"%d29b5b1ca3de84e3b38054c62afe351a;FI" _version;TI"%ad5851230fbdd4f8a862674697158df2;F +;TI"required_assets_digest;TI"%8e84f94bfeea95b7f72c57dc7f107403;FI" _version;TI"%ad5851230fbdd4f8a862674697158df2;F \ No newline at end of file