jquery 1.9.1 upgrade ... remove jquery rails
This commit is contained in:
parent
564d242832
commit
6ed79e66bc
2
Gemfile
2
Gemfile
|
@ -33,8 +33,6 @@ gem 'image_optim'
|
|||
# note: for image_sorcery to correctly work you need
|
||||
# sudo apt-get install -y imagemagick
|
||||
gem 'image_sorcery'
|
||||
# it patches stuff, I think we need it in prd
|
||||
gem 'jquery-rails'
|
||||
gem 'multi_json'
|
||||
gem 'mustache'
|
||||
gem 'nokogiri'
|
||||
|
|
|
@ -243,9 +243,6 @@ GEM
|
|||
coffee-rails
|
||||
haml
|
||||
journey (1.0.4)
|
||||
jquery-rails (2.2.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jshint_on_rails (1.0.2)
|
||||
json (1.7.7)
|
||||
jwt (0.1.8)
|
||||
|
@ -510,7 +507,6 @@ DEPENDENCIES
|
|||
image_optim
|
||||
image_sorcery
|
||||
jasminerice
|
||||
jquery-rails
|
||||
jshint_on_rails
|
||||
librarian (>= 0.0.25)
|
||||
listen
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
//= require ./discourse/components/probes.js
|
||||
|
||||
// Externals we need to load first
|
||||
//= require ./external/jquery-1.8.3.js
|
||||
//= require ./external/jquery-1.9.1.js
|
||||
//= require ./external/jquery.ui.widget.js
|
||||
//= require ./external/handlebars-1.0.rc.3.js
|
||||
<%
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* ===================================================
|
||||
* bootstrap-transition.js v2.0.2
|
||||
* bootstrap-transition.js v2.3.2
|
||||
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
||||
* ===================================================
|
||||
* Copyright 2012 Twitter, Inc.
|
||||
|
@ -17,35 +17,44 @@
|
|||
* limitations under the License.
|
||||
* ========================================================== */
|
||||
|
||||
!function( $ ) {
|
||||
|
||||
!function ($) {
|
||||
|
||||
"use strict"; // jshint ;_;
|
||||
|
||||
|
||||
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
|
||||
* ======================================================= */
|
||||
|
||||
$(function () {
|
||||
|
||||
"use strict"
|
||||
|
||||
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
|
||||
* ======================================================= */
|
||||
|
||||
$.support.transition = (function () {
|
||||
var thisBody = document.body || document.documentElement
|
||||
, thisStyle = thisBody.style
|
||||
, support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
|
||||
|
||||
return support && {
|
||||
end: (function () {
|
||||
var transitionEnd = "TransitionEnd"
|
||||
if ( $.browser.webkit ) {
|
||||
transitionEnd = "webkitTransitionEnd"
|
||||
} else if ( $.browser.mozilla ) {
|
||||
transitionEnd = "transitionend"
|
||||
} else if ( $.browser.opera ) {
|
||||
transitionEnd = "oTransitionEnd"
|
||||
var transitionEnd = (function () {
|
||||
|
||||
var el = document.createElement('bootstrap')
|
||||
, transEndEventNames = {
|
||||
'WebkitTransition' : 'webkitTransitionEnd'
|
||||
, 'MozTransition' : 'transitionend'
|
||||
, 'OTransition' : 'oTransitionEnd otransitionend'
|
||||
, 'transition' : 'transitionend'
|
||||
}
|
||||
, name
|
||||
|
||||
for (name in transEndEventNames){
|
||||
if (el.style[name] !== undefined) {
|
||||
return transEndEventNames[name]
|
||||
}
|
||||
return transitionEnd
|
||||
}())
|
||||
}
|
||||
|
||||
}())
|
||||
|
||||
return transitionEnd && {
|
||||
end: transitionEnd
|
||||
}
|
||||
|
||||
})()
|
||||
|
||||
})
|
||||
|
||||
}( window.jQuery );
|
||||
}(window.jQuery);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1 +1 @@
|
|||
//= require ./external/jquery-1.8.3.js
|
||||
//= require ./external/jquery-1.9.1.js
|
||||
|
|
Loading…
Reference in New Issue