diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-28 19:52:30 +0200 |
| commit | bdd275474044152a5d9a33ea6b8a8071b931d27e (patch) | |
| tree | b10c2b68e0236925992449786d70f45aaca21984 /library/tinymce/examples/lists | |
| parent | 792edfe9c834e3daeae598727e4cb15dc0ff8475 (diff) | |
| parent | e894775a39920edc0e438364c818357ab809bace (diff) | |
| download | volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.gz volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.tar.bz2 volse-hubzilla-bdd275474044152a5d9a33ea6b8a8071b931d27e.zip | |
Merge commit '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 |