Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: alohaeditor/Aloha-Editor
...
head fork: alohaeditor/Aloha-Editor
Commits on May 07, 2012
@petrosalema petrosalema Inserting a check if Aloha.activeEditable does is null. a8fe3f6
Commits on May 08, 2012
@petrosalema petrosalema Circumventing a IE7 browser crash caused by cloned nodes used in `get…
…Contents()'.
14da350
@petrosalema petrosalema Changing the means in which we clone a element, to not use jQuery's c…
…lone() which sometimes causes crashes in IE7.
ab48084
@petrosalema petrosalema Removing the use of jQuery.clone() in the core files. Because of IE7 …
…being

buggy with cloned nodes and removeAttributes(), cloning nodes with jQuery would
sometimes cause the the browser to crash. Implemented is a work-around that
circumvents the need to use jQuery.clone().
c9cbf74
Commits on May 11, 2012
@petrosalema petrosalema Implementing work-around for IE7 bug in `isCollapsedLineBreak()'.
The IE7 behaviour of getAttribute() is buggy in that it differs from the
documentation.  According to the DOM Level 2 documentation at:
http://msdn.microsoft.com/en-us/library/ie/ms536429(v=vs.85).aspx, the return
value of getAttribute() should be a string, interger, or boolean.  But when one
queries for node.getAttribute('style'), what is actually returned is not a
string, as one might expect, but an object.  The returned object is in fact the
style *object*.  I.e., node.style === node.getAttribute('style') .
2d520e4
Commits on May 14, 2012
@petrosalema petrosalema Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into hotfix 656b8b1
@petrosalema petrosalema Fixes problem where execCommands execution causes IE resize handles t…
…o be

rendered around paragraphs in IE7.

This is an identical problem and solution as that involved in commit
2d520e4 -- herebelow quoted:

"Implementing work-around for IE7 bug in `isCollapsedLineBreak()'.

	The IE7 behaviour of getAttribute() is buggy in that it differs from the
	documentation.  According to the DOM Level 2 documentation at:
	http://msdn.microsoft.com/en-us/library/ie/ms536429(v=vs.85).aspx, the return
	value of getAttribute() should be a string, interger, or boolean.  But when one
	queries for node.getAttribute('style'), what is actually returned is not a
	string, as one might expect, but an object.  The returned object is in fact the
	style *object*.  I.e., node.style === node.getAttribute('style') ."
330567f
@Jotschi Jotschi The browser will now no longer stick to the right side of the window.…
… A padding was added.
4af6199
@Jotschi Jotschi Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into re…
…lease
7fb87cf
Commits on May 15, 2012
@petrosalema petrosalema Added documentation for flag-icons plugin. Also having metaview and w…
…ai-lang

plugins require flag-icons plugins to ensure that is loaded.
20f2b2b
@petrosalema petrosalema Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into re…
…lease
2db5565
@petrosalema petrosalema Refactoring cite plugin. Bringing it to coding standards. Adding appr…
…opriate guards for reading settings
c2d3a0c
@petrosalema petrosalema Removes animation styling once animation is done on elements that cit…
…e plugin quote elements.
00078ac
@petrosalema petrosalema Updating sandbox.html 7aea852
Commits on May 21, 2012
@petrosalema petrosalema Removing errors in delete and forwarddelete algorithms that were intr…
…oduced

with commit 036530f.  We should look for an
alternative way to address the problem which that commit was attempting to
solve.
5b9ccc5
Commits on May 23, 2012
@petrosalema petrosalema Changelog for commit 5b9ccc5. 5db0ff0
@Jotschi Jotschi Reverted 14da350. The old IE7 workaround removed all event handlers o…
…nce getContents() was called. The workaround was not browser specific. This caused other defects within IE9. The new workaround is browser specific. We now remove the expando attribute when copying attributes. The reading of the expando attribute name somehow caused a bug in ie7 to surface. A following clone call would crash ie7.
c3e9034
@Jotschi Jotschi Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into re…
…lease

Conflicts:
	build/release-changelog.md
ced2a93
Commits on May 24, 2012
@Jotschi Jotschi Prepared changelog for release 7e40b0c
@GenticsDev GenticsDev [maven-release-plugin] prepare release alohaeditor-0.20.12 69f83e2
@GenticsDev GenticsDev [maven-release-plugin] prepare for next development iteration 28fea30
@GenticsDev GenticsDev Preparing maven release 22514cc
@GenticsDev GenticsDev Post release cleanup dd4456e
Commits on May 30, 2012
@Jotschi Jotschi Update CHANGELOG.md fb79ade
Commits on Jun 01, 2012
@Jotschi Jotschi Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into dev
Conflicts:
	CHANGELOG.md
	pom.xml
	src/lib/aloha/engine.js
e3fc12f
Something went wrong with that request. Please try again.