Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

dev merge hotfix #534

Merged
merged 99 commits into from May 8, 2012

Conversation

Projects
None yet
8 participants
Member

evo42 commented May 8, 2012

merging #507

Petro Salema and others added some commits Apr 4, 2012

Fixed checks for considering what offset is the safest in IE 8 and ol…
…der to reckon that a selection is at the front position of a text container
function `jumpBlock()' will land in available editable node if one ex…
…ists next to an adjacent non-editable block.
Added more checks for invisible elements. Restructured algorithm to a…
…void

expensive work in iE.  Added cleanup of placeholders.
Added support to compareDocumentPosition for older versions of IE.
jQuery's `find()' method was throwing errors in IE 7, and 8.
core: Fixed a permission error in Firefox, when Aloha Editor tried to…
… access a document property of an external ressource
DONE obey coding guidelines
DONE write JSLint compliant code
DONE write JSDoc for every method you touched during your implementation
DONE write a human-readable :) changelog entry that describes your change
N/A add a qunit test (if it makes sense) and/or document the steps to manually test it (in a separate guides page)
N/A test your changes in Internet Explorer 7, 8, 9 and the latest Firefox and latest Chrome
N/A document your changes in a guide
DONE include this list in a your pull request
Fixed initialization of new button groups to happen whenever a corres…
…ponding

`extButtonGroup' is not present.

Reviewed by: Clemens
Merge pull request #502 from berni2288/hotfix-firefox-permission-error
core: Fixed a permission error in Firefox, when Aloha Editor tried to access a document property of an external ressource
fixed bug with fm shadow showing too early
also cleaned up old changlog entry I put in the wrong place

DONE obey coding guidelines
http://aloha-editor.org/builds/development/latest/doc/guides/output/style_guide.html
DONE write JSLint compliant code
DONE write JSDoc for every method you touched during your implementation
DONE write a human-readable :) changelog entry that describes your change
NA add a qunit test (if it makes sense) and/or document the steps to
manually test it (in a separate guides page)
NA test your changes in Internet Explorer 7, 8, 9 and the latest Firefox
and latest Chrome
NA document your changes in a guide
DONE include this list in a your pull request
link plugin: removed linklist (and slowlinklist) which where loaded b…
…y default (we should not force everyone to have them active by default); updated link to the wiki
Member

berni2288 commented on d72b88b Apr 13, 2012

quick ugly fixes tend to produce more ugly bugs that need more quickly ugly fixes for ugly bugs.

that's why slow clean fixes are less time consuming in the end :P

berni2288 and others added some commits Apr 13, 2012

table-plugin: Fixed the cleanup of the table cells on blur not cleani…
…ng up correctly (caused by a typo in the element class)
Merge pull request #505 from berni2288/hotfix-tablecellcleanuptypo
table-plugin: Fixed the cleanup of the table cells on blur not cleaning up correctly (caused by a typo in the element class)
core: Fixed a javascript error in IE9 stating that the method createC…
…ontextualFragment doesn't exist (fixed in extjs)
Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hot…
…fix-createcontextualfragment

Conflicts:
	build/hotfix-changelog.md
Merge pull request #508 from berni2288/hotfix-createcontextualfragment
core: Fixed a javascript error in IE9 stating that the method createContextualFragment doesn't exist (fixed in extjs)

This causes a nasty error in firefox 11. I'll add another typof for srcElement.

GenticsDev and others added some commits Apr 16, 2012

Merge pull request #509 from Jotschi/hotfix
Fixed e.srcElement is undefined error in firefox 11
core: Fixed a typo in the previous bugfix: Fixed a javascript error i…
…n IE9 stating that the method createContextualFragment doesn't exist
Merge pull request #512 from berni2288/hotfix-createcontextualfragment
core: Fixed a typo in the previous bugfix: Fixed a javascript error in IE9 stating that the method createContextualFragment doesn't exist
Merge pull request #521 from berni2288/hotfix-createcontextualfragment
Rebuilt aloha.js to the reflect the recent changes
Merge pull request #526 from Jotschi/hotfix
Browser.js javascript error fix
some bugfixes... #517 #516 #515; also removed layerX and layerY from …
…jQuery (webkit messages) #381 #419; added window. to setTimeouts
The browser plugin can now adjust the width of the browser automatica…
…lly. Previous the width was fixed at a given value.
Removed old css that were not enabled. Changed onWindowResized to a p…
…rivate method. Added css workaround to _onWindowResized method.
Merge pull request #527 from Jotschi/hotfix
Changed browser plugin browser width behaviour

evo42 added a commit that referenced this pull request May 8, 2012

@evo42 evo42 merged commit 81b8251 into alohaeditor:dev May 8, 2012

Owner

npomaroli commented on ea1129f Jun 5, 2012

How can this ever have worked? The endBr is created right above and not yet inserted into the DOM tree, so how could you possibly insert something before it?
I will take this out, since it always creates Javascript errors....

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment