diff options
| author | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-21 08:08:23 +0100 |
| commit | 88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e (patch) | |
| tree | dd2eff7d2870ee2c292fd39e69cdaa5a0a9b2fdb /library/tinymce/examples/lists | |
| parent | cf347664165f97b5262d15464bbb169cbdb4ddd4 (diff) | |
| parent | efd7c14c24aa45878ddc412413ea1593cafcd651 (diff) | |
| download | volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.gz volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.tar.bz2 volse-hubzilla-88bbc5e0bc89f84aaf5160546dfa782f8f1d7e5e.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'library/tinymce/examples/lists')
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/image_list.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/link_list.js | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/media_list.js | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/template_list.js | 0 |
4 files changed, 5 insertions, 1 deletions
diff --git a/library/tinymce/examples/lists/image_list.js b/library/tinymce/examples/lists/image_list.js index 7ba049a24..7ba049a24 100755..100644 --- a/library/tinymce/examples/lists/image_list.js +++ b/library/tinymce/examples/lists/image_list.js diff --git a/library/tinymce/examples/lists/link_list.js b/library/tinymce/examples/lists/link_list.js index 0d464331f..0d464331f 100755..100644 --- a/library/tinymce/examples/lists/link_list.js +++ b/library/tinymce/examples/lists/link_list.js diff --git a/library/tinymce/examples/lists/media_list.js b/library/tinymce/examples/lists/media_list.js index 3a3836cc5..2e049587c 100755..100644 --- a/library/tinymce/examples/lists/media_list.js +++ b/library/tinymce/examples/lists/media_list.js @@ -6,5 +6,9 @@ var tinyMCEMediaList = [ // Name, URL
["Some Flash", "media/sample.swf"],
["Some Quicktime", "media/sample.mov"],
- ["Some AVI", "media/sample.avi"]
+ ["Some AVI", "media/sample.avi"],
+ ["Some RealMedia", "media/sample.rm"],
+ ["Some Shockwave", "media/sample.dcr"],
+ ["Some Video", "media/sample.mp4"],
+ ["Some FLV", "media/sample.flv"]
];
\ No newline at end of file diff --git a/library/tinymce/examples/lists/template_list.js b/library/tinymce/examples/lists/template_list.js index e06d35788..e06d35788 100755..100644 --- a/library/tinymce/examples/lists/template_list.js +++ b/library/tinymce/examples/lists/template_list.js |