Permalink
Browse files

merge hotfix / dev

  • Loading branch information...
2 parents c5b3e5f + b37181d commit d96a4ccde6b3c3c4160d15d9121fbbf9d46b9b03 @evo42 committed Mar 12, 2012
View
@@ -36,6 +36,9 @@ All changes are categorized into one of the following keywords:
- **FEATURE** plugin extra/proxy: as multiple plugins need a proxy script to access external resources there's now one for all to use
- **FEATURE** editable.js: introduced method setContents() -- use Aloha.getEditableById('my-editable').setContents('Aloha World') to set the contents of the editable with the ID my-editable
+- **FEATURE** editable.js: introduced method setContents() -- use Aloha.getEditableById('my-editable').setContents('Aloha World') to set the contents of the editable with the ID my-editable
+- **BUG** smartContentChange is now again triggered when pressing enter key; and new: delete / backspace keys
+- **ENHANCEMENT** enabled image plugin in boilerplate demo. needs some enhancements to be more user friendly
## 0.20.7 - 2012/03/7
@@ -355,16 +358,14 @@ All changes are categorized into one of the following keywords:
The reason for not releasing this builds was the ongoing refactoring of the core engine to implement all functionallities based on execCommand.
Non of these releases reached a production ready state. We still increased the release number due to the fact that we also tested the new release process with maven and archivia and it would brake dependencies if we wouldn't have increased the version number.
-## 0.9.3 - 2010/10
-
-- Link/Href Handling
-- Repositories
- - Delicious repository
- - LinkList repository
-- Textarea and `$('#myTextarea').aloha()` Support
-- Plugins are now SubModules
-- new plugins
-- MS Word pastehandler
- - Table
- - Abbreviation
- - LinkChecker Plugin
+
+## 0.9.3 - October 2010
+ - Link/Href handling
+ - Repository browser
+ - As well as sample Delicious and LinkList Repositories
+ - Textarea and $('#myTextarea').aloha() support
+ - Table plugin
+ - Paste from Microsoft Word
+ - Plugins are now submodules
+ - Abbreviation plugin
+ - LinkChecker plugin
@@ -31,10 +31,13 @@
common/paste,
common/characterpicker,
common/commands,
- extra/flag-icons,
+ common/image,
common/abbr,
+ extra/flag-icons,
+ extra/wai-lang,
extra/browser,
extra/linkbrowser"></script>
+
<script src="js/aloha-boilerplate.js"></script>
</head>
<body>
@@ -199,6 +202,7 @@
like <abbr title="Hyper Text Markup Language">HTML</abbr> and
<abbr title="Cascading Style Sheets">CSS</abbr>.
</p>
+ <p>powered by <img src="http://aloha-editor.org/logo/Aloha%20Editor%20logo%20text%20128.png" alt="Aloha Editor" title="Aloha Editor" />
</div>
<div id="references"></div>
</div>
@@ -82,8 +82,9 @@ define( [
// delimiters, timer and idle for smartContentChange
// smartContentChange triggers -- tab: '\u0009' - space: '\u0020' - enter: 'Enter'
+ // backspace: U+0008 - delete: U+007F
this.sccDelimiters = [ ':', ';', '.', '!', '?', ',',
- unescape( '%u0009' ), unescape( '%u0020' ), 'Enter' ];
+ unescape( '%u0009' ), unescape( '%u0020' ), unescape( '%u0008' ), unescape( '%u007F' ), 'Enter' ];
this.sccIdle = 5000;
this.sccDelay = 500;
this.sccTimerIdle = false;
@@ -207,8 +208,13 @@ define( [
// if it does not handle the keyStroke it returns true and therefore all other
// events (incl. browser's) continue
me.obj.keydown( function( event ) {
+ var letEventPass = Markup.preProcessKeyStrokes( event );
me.keyCode = event.which;
- return Markup.preProcessKeyStrokes( event );
+ if (!letEventPass) {
+ // the event will not proceed to key press, therefore trigger smartContentChange
+ me.smartContentChange( event );
+ }
+ return letEventPass;
} );
// handle keypress
@@ -62,7 +62,7 @@ function( Aloha, jQuery, ContentHandlerManager, console ) {
],
attributes: {
- 'a': ['href', 'title', 'id', 'data-gentics-aloha-repository', 'data-gentics-aloha-object-id'],
+ 'a': ['href', 'title', 'id', 'class', 'data-gentics-aloha-repository', 'data-gentics-aloha-object-id'],
'div': [ 'id', 'class'],
'abbr': ['title'],
'blockquote': ['cite'],
@@ -75,7 +75,8 @@ function( Aloha, jQuery, ContentHandlerManager, console ) {
'table': ['summary', 'width'],
'td': ['abbr', 'axis', 'colspan', 'rowspan', 'width'],
'th': ['abbr', 'axis', 'colspan', 'rowspan', 'scope', 'width'],
- 'ul': ['type']
+ 'ul': ['type'],
+ 'span': ['class']
},
protocols: {
@@ -76,7 +76,9 @@ define( [
range.startOffset = range.endOffset = currentStartOffset;
// 4. Invoke the final selection
range.select();
-
+
+ Aloha.trigger( 'aloha-link-selected-in-linkbrowser' , item );
+
// Close the browser lightbox
this.close();
},

0 comments on commit d96a4cc

Please sign in to comment.