-
Notifications
You must be signed in to change notification settings - Fork 114
Dialogs overhaul #639
Dialogs overhaul #639
Changes from 86 commits
2717957
d0d6ef0
5ad672a
a54f008
a2ebc34
25a3fa9
e11f8ee
b9c5480
2d714ff
c9db264
8d52605
21b365e
cbdeed2
b6a0568
844c379
b502efd
dc0ee48
b14ca92
96072e5
2787d56
78df53b
8ad25c0
0bb0f3a
a8045c7
6a28b97
05e5e90
4e31cd3
feff1ae
eb4ad56
da70824
3b66e16
f1b39f0
da5f97c
a0e6522
285b889
bfc7c4b
413028f
c08d019
79fb2db
015eb30
f05aee7
afd2967
3745d40
864a691
9f9b73b
35ffff7
0d4e747
43ade54
8a98089
fe5e0f3
751ec4c
b9b8518
d5d16b4
c6e21a6
e3cd60f
60d14ac
e622cd8
afcefef
b952645
0587d5d
511781d
3ff0aed
cc3ac51
96cc138
97be71f
6486b10
490541c
1526dd8
d131329
41022ac
c6fce21
eafba3a
4e0cc9b
aa5ce5a
e2255e0
fb269e3
8bb2025
ed9be39
8439e03
869618d
a22e894
04b9680
56438fe
05f79e2
df83da7
eedffc0
09d08f0
72d79fa
3323981
cc146ae
148520c
f0bbbf6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -248,6 +248,7 @@ module.exports = function (grunt) { | |
src: [ | ||
"<%= yeoman.app %>/lib/jquery.browser.js", | ||
"<%= yeoman.app %>/wymeditor/core.js", | ||
"<%= yeoman.app %>/wymeditor/editor/dialogs.js", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Concatenate the new module. |
||
"<%= yeoman.app %>/wymeditor/editor/base.js", | ||
"<%= yeoman.app %>/wymeditor/editor/" + | ||
"document-structure-manager.js", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -394,9 +394,6 @@ or useful for deep customization. | |
|
||
WYMeditor's relative/absolute base path | ||
(including the trailing slash). | ||
Until we remove our pop-up window dialogs, | ||
this is used to load necessary javascript | ||
in those dialog windows. | ||
|
||
This value is automatically guessed by ``computeWymPath``, | ||
which looks for the ``script`` element | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Dialog windows don't load their own scripts, anymore. This makes it far easier to understand the code. And makes it way more possible to debug. |
||
|
@@ -426,26 +423,6 @@ that will be initialized inside the editor body itself. | |
This value is automatically guessed, | ||
based on the ``basePath`` value. | ||
|
||
``jQueryPath`` | ||
-------------- | ||
|
||
This contains the full path or URL | ||
to a copy of the jQuery library. | ||
Like :ref:`options-basePath`, | ||
we only need to know this path | ||
in order to load it inside pop-up dialogs. | ||
|
||
Also like :ref:`option-basePath`, | ||
this value is automatically guessed, | ||
but in this case by ``computeJqueryPath()``. | ||
|
||
Example | ||
~~~~~~~ | ||
|
||
.. code-block:: javascript | ||
|
||
jQueryPath: "/js/jquery.js" | ||
|
||
``updateSelector`` and ``updateEvent`` | ||
-------------------------------------- | ||
|
||
|
@@ -516,7 +493,7 @@ List of HTML Template Options | |
* dialogHtml | ||
* dialogLinkHtml | ||
* dialogFeatures | ||
The dialogs' features. e.g. | ||
The dialogs' default features. e.g. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because now each dialog can have its own features, specified in its object. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just a doc fix. |
||
|
||
.. code-block:: javascript | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -364,21 +364,10 @@ Undo | |
undo an action. | ||
Redo | ||
redo an action. | ||
CreateLink | ||
open the link dialog and create/update a link on the selection. | ||
Unlink | ||
remove a link, based on the selection. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
InsertImage | ||
open the image dialog and insert/update an image. | ||
InsertTable | ||
open the table dialog and insert a table. | ||
Paste | ||
opens the paste dialog and paste raw paragraphs from an external | ||
application, e.g. Word. | ||
ToggleHtml | ||
show/hide the HTML value. | ||
Preview | ||
open the preview dialog. | ||
|
||
``link(attrs)`` | ||
=============== | ||
|
@@ -460,30 +449,6 @@ Example: switch the root container to Heading 1. | |
|
||
wym.mainContainer('H1'); | ||
|
||
``wrap(left, right)`` | ||
===================== | ||
|
||
*Parameters* | ||
|
||
* left: XHTML string | ||
* right: XHTML string | ||
|
||
*Description* | ||
|
||
Wrap the inline selection with XHTML. | ||
|
||
Example: | ||
|
||
.. code-block:: javascript | ||
|
||
wym.wrap('<span class="city">', '</span>'); | ||
|
||
``unwrap()`` | ||
============ | ||
|
||
Unwrap the selection, by removing inline elements but keeping the selected | ||
text. | ||
|
||
``registerModification()`` | ||
==================== | ||
|
||
|
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#641.