mirror of
https://github.com/discourse/discourse.git
synced 2025-01-30 22:42:40 +08:00
Upgrade Ember to Fix CVE-2013-4170
This commit is contained in:
parent
c28b377494
commit
fca83cb185
|
@ -309,8 +309,6 @@ Discourse = Ember.Application.createWithMixins({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Start up the Discourse application.
|
Start up the Discourse application.
|
||||||
|
|
||||||
|
@ -332,3 +330,4 @@ Discourse = Ember.Application.createWithMixins({
|
||||||
});
|
});
|
||||||
|
|
||||||
Discourse.Router = Discourse.Router.reopen({ location: 'discourse_location' });
|
Discourse.Router = Discourse.Router.reopen({ location: 'discourse_location' });
|
||||||
|
|
||||||
|
|
33
app/assets/javascripts/discourse/ember/event_dispatcher.js
Normal file
33
app/assets/javascripts/discourse/ember/event_dispatcher.js
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
/*
|
||||||
|
Discourse is not interested in watching `mouseMove` or `touchMove` events on an Ember views,
|
||||||
|
so we remove them from the events the EventDispatcher watches for.
|
||||||
|
*/
|
||||||
|
Ember.EventDispatcher.reopen({
|
||||||
|
events: {
|
||||||
|
touchstart : 'touchStart',
|
||||||
|
touchend : 'touchEnd',
|
||||||
|
touchcancel : 'touchCancel',
|
||||||
|
keydown : 'keyDown',
|
||||||
|
keyup : 'keyUp',
|
||||||
|
keypress : 'keyPress',
|
||||||
|
mousedown : 'mouseDown',
|
||||||
|
mouseup : 'mouseUp',
|
||||||
|
contextmenu : 'contextMenu',
|
||||||
|
click : 'click',
|
||||||
|
dblclick : 'doubleClick',
|
||||||
|
focusin : 'focusIn',
|
||||||
|
focusout : 'focusOut',
|
||||||
|
mouseenter : 'mouseEnter',
|
||||||
|
mouseleave : 'mouseLeave',
|
||||||
|
submit : 'submit',
|
||||||
|
input : 'input',
|
||||||
|
change : 'change',
|
||||||
|
dragstart : 'dragStart',
|
||||||
|
drag : 'drag',
|
||||||
|
dragenter : 'dragEnter',
|
||||||
|
dragleave : 'dragLeave',
|
||||||
|
dragover : 'dragOver',
|
||||||
|
drop : 'drop',
|
||||||
|
dragend : 'dragEnd'
|
||||||
|
}
|
||||||
|
});
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,3 +1,5 @@
|
||||||
|
//= require_tree ./discourse/ember
|
||||||
|
|
||||||
// The rest of the externals
|
// The rest of the externals
|
||||||
//= require_tree ./external
|
//= require_tree ./external
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user