Permalink
Browse files

fixed a typo, fixed event handling inside CleanPaste in IE

  • Loading branch information...
1 parent 9f8eed6 commit be3ba0f784c5d86a3a0e61b42d60fff2ab8ab17d André Fiedler committed with Feb 1, 2011
View
@@ -1 +1 @@
-<settings version="0.0.2" ><auto><configurations /><panel>{"ext/editors/editors":{"parent":{"visible":2,"flex":1},"visible":2,"flex":1},"ext/tree/tree":{"parent":{"visible":2,"width":315},"visible":true,"flex":3,"state":"normal"},"ext/console/console":{"parent":{"visible":2,"height":"41"},"visible":false,"flex":1}}</panel><tree>["folder[1]","folder[1]/folder[4]","folder[1]/folder[4]/folder[2]","folder[1]/folder[4]/folder[2]/file[1]","folder[1]/folder[1]","folder[1]/folder[1]/folder[2]","folder[1]/folder[1]/folder[2]/file[17]","folder[1]/folder[4]/folder[2]/file[4]","folder[1]/folder[4]/folder[2]/file[6]","folder[1]/folder[1]/folder[1]","folder[1]/folder[1]/folder[1]/file[1]","folder[1]/folder[1]/folder[2]/file[5]","folder[1]/folder[1]/folder[2]/file[9]","folder[1]/folder[4]/folder[2]/file[2]","folder[1]/folder[1]/folder[2]/file[11]"]</tree><files active="/sunbox/mooeditable/workspace/Source/MooEditable/MooEditable.CleanPaste.js"><file path="/sunbox/mooeditable/workspace/Source/MooEditable/MooEditable.js" type="file" size="40421" name="MooEditable.js" contenttype="application/javascript; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_sunbox/workspaces/mooeditable/Source/MooEditable/MooEditable.js"/><file path="/sunbox/mooeditable/workspace/Source/MooEditable/MooEditable.CleanPaste.js" type="file" size="6394" name="MooEditable.CleanPaste.js" contenttype="application/javascript; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_sunbox/workspaces/mooeditable/Source/MooEditable/MooEditable.CleanPaste.js"/><file path="/sunbox/mooeditable/workspace/Demos/MooEditable/MooEditable.CleanPaste.html" type="file" size="1942" name="MooEditable.CleanPaste.html" contenttype="text/html; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_sunbox/workspaces/mooeditable/Demos/MooEditable/MooEditable.CleanPaste.html"/><file path="/sunbox/mooeditable/workspace/Demos/MooEditable/MooEditable.html" type="file" size="1328" name="MooEditable.html" contenttype="text/html; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_sunbox/workspaces/mooeditable/Demos/MooEditable/MooEditable.html"/></files></auto><general name="General" page="pgSettingsGeneral" saveallbeforerun="true"/><editors name="Editor" page="pgSettingsEditors"><code name="Code Editor" overwrite="false" selectstyle="line" activeline="true" showinvisibles="false" showprintmargin="true" printmargincolumn="80" softtabs="true" tabsize="4" scrollspeed="2"/></editors></settings>
+<settings version="0.0.2" ><auto><configurations /><panel>{"ext/editors/editors":{"parent":{"visible":2,"flex":1},"visible":2,"flex":1},"ext/tree/tree":{"parent":{"visible":2,"width":313},"visible":true,"flex":3,"state":"normal"},"ext/console/console":{"parent":{"visible":2,"height":"41"},"visible":false,"flex":1}}</panel><tree>["folder[1]","folder[1]/folder[4]","folder[1]/folder[4]/folder[2]","folder[1]/folder[4]/folder[2]/file[6]","folder[1]/folder[4]/folder[2]/file[1]","folder[1]/folder[1]","folder[1]/folder[1]/folder[2]","folder[1]/folder[1]/folder[2]/file[17]"]</tree><files active="/sunbox/mooeditable/workspace/Demos/MooEditable/MooEditable.ExtendedLinksDialog.html"><file path="/sunbox/mooeditable/workspace/Source/MooEditable/MooEditable.CleanPaste.js" type="file" size="7030" name="MooEditable.CleanPaste.js" contenttype="application/javascript; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_sunbox/workspaces/mooeditable/Source/MooEditable/MooEditable.CleanPaste.js"/><file path="/sunbox/mooeditable/workspace/Source/MooEditable/MooEditable.UI.ExtendedLinksDialog.js" type="file" size="4640" name="MooEditable.UI.ExtendedLinksDialog.js" contenttype="application/javascript; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_sunbox/workspaces/mooeditable/Source/MooEditable/MooEditable.UI.ExtendedLinksDialog.js"/><file path="/sunbox/mooeditable/workspace/Demos/MooEditable/MooEditable.ExtendedLinksDialog.html" type="file" size="1944" name="MooEditable.ExtendedLinksDialog.html" contenttype="text/html; charset=utf-8" creationdate="" lockable="false" hidden="false" executable="false" scriptname="/home/ide_sunbox/workspaces/mooeditable/Demos/MooEditable/MooEditable.ExtendedLinksDialog.html"/></files></auto><general name="General" page="pgSettingsGeneral" saveallbeforerun="true"/><editors name="Editor" page="pgSettingsEditors"><code name="Code Editor" overwrite="false" selectstyle="line" activeline="true" showinvisibles="false" showprintmargin="true" printmargincolumn="80" softtabs="true" tabsize="4" scrollspeed="2"/></editors></settings>
@@ -16,7 +16,7 @@
border: 2px solid #ddd;
}
- .mooeditable-ui-dialog .dialog-input-protocoll,
+ .mooeditable-ui-dialog .dialog-input-protocol,
.mooeditable-ui-dialog .dialog-input-url
{ margin: 0 0 5px 0; }
.mooeditable-ui-dialog .dialog-input-target
@@ -113,7 +113,7 @@ Locale.define('de-DE', 'MooEditable', {
deleteTableCol: 'Tabellenspalten löschen',
// MooEditable.UI.ExtendedLinksDialog
- protocoll: 'Protokoll',
+ protocol: 'Protokoll',
link: 'Link',
email: 'E-Mail',
urlWithoutHttp: 'URL (ohne http://)',
@@ -113,7 +113,7 @@ Locale.define('en-US', 'MooEditable', {
deleteTableCol: 'Delete Table Column',
// MooEditable.UI.ExtendedLinksDialog
- protocoll: 'protocoll',
+ protocol: 'protocol',
link: 'link',
email: 'e-Mail',
urlWithoutHttp: 'URL (without http://)',
@@ -53,7 +53,7 @@ provides: [MooEditable.CleanPaste]
false;
if(!!txtPastet) {
this.selection.insertContent(this.cleanHtml(txtPastet));
- e.preventDefault();
+ new Event(e).stop();
}
else { // no clipboard data available
this.selection.insertContent('<span id="INSERTION_MARKER">&nbsp;</span>');
@@ -24,7 +24,7 @@ provides: [MooEditable.UI.ExtendedLinksDialog]
(function(){
MooEditable.Locale.define({
- protocoll: 'protocoll',
+ protocol: 'protocol',
link: 'link',
email: 'e-Mail',
urlWithoutHttp: 'URL (without http://)',
@@ -45,7 +45,7 @@ var urlRegex = /^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z
MooEditable.UI.ExtendedLinksDialog = function(editor){
var html = '<div class="dialog-column"><label class="dialog-label">'
- + MooEditable.Locale.get('protocoll').camelCaseFirst()+ '<br/><select class="dialog-input-protocoll">'
+ + MooEditable.Locale.get('protocol').camelCaseFirst()+ '<br/><select class="dialog-input-protocol">'
+ '<option value="http">' + MooEditable.Locale.get('link') + '</option>'
+ '<option value="mailto">' + MooEditable.Locale.get('email') + '</option>'
+ '</select></label></div>'
@@ -62,7 +62,7 @@ MooEditable.UI.ExtendedLinksDialog = function(editor){
return new MooEditable.UI.Dialog(html, {
'class': 'mooeditable-prompt-dialog',
onOpen: function(){
- var protocoll_input = this.el.getElement('.dialog-input-protocoll');
+ var protocoll_input = this.el.getElement('.dialog-input-protocol');
var url_input = this.el.getElement('.dialog-input-url');
var target_input = this.el.getElement('.dialog-input-target');
var text = editor.selection.getText();
@@ -92,7 +92,7 @@ MooEditable.UI.ExtendedLinksDialog = function(editor){
e.preventDefault();
if (e.target.tagName.toLowerCase() != 'button') return;
var button = document.id(e.target);
- var protocoll_input = this.el.getElement('.dialog-input-protocoll');
+ var protocoll_input = this.el.getElement('.dialog-input-protocol');
var url_input = this.el.getElement('.dialog-input-url');
var target_input = this.el.getElement('.dialog-input-target');
if (button.hasClass('dialog-cancel-button')){

0 comments on commit be3ba0f

Please sign in to comment.