forked from GNUsocial/gnu-social
		
	Update TinyMCE plugin for reusable thingies; doesn't quite arrange properly in the layout, we'll have to figure that out still.
This commit is contained in:
		@@ -290,9 +290,14 @@ class TinyMCEPlugin extends Plugin
 | 
				
			|||||||
        // our AJAX form submission. Manually moving it to trigger
 | 
					        // our AJAX form submission. Manually moving it to trigger
 | 
				
			||||||
        // on our send button click.
 | 
					        // on our send button click.
 | 
				
			||||||
        $scr = <<<END_OF_SCRIPT
 | 
					        $scr = <<<END_OF_SCRIPT
 | 
				
			||||||
        $().ready(function() {
 | 
					        (function() {
 | 
				
			||||||
            var noticeForm = $('#form_notice');
 | 
					        var origInit = SN.Init.NoticeFormSetup;
 | 
				
			||||||
            $('textarea#notice_data-text').tinymce({
 | 
					        SN.Init.NoticeFormSetup = function(form) {
 | 
				
			||||||
 | 
					            origInit(form);
 | 
				
			||||||
 | 
					            var noticeForm = form;
 | 
				
			||||||
 | 
					            var textarea = form.find('.notice_data-text');
 | 
				
			||||||
 | 
					            if (textarea.length == 0) return;
 | 
				
			||||||
 | 
					            textarea.tinymce({
 | 
				
			||||||
                script_url : '{$path}',
 | 
					                script_url : '{$path}',
 | 
				
			||||||
                // General options
 | 
					                // General options
 | 
				
			||||||
                theme : "advanced",
 | 
					                theme : "advanced",
 | 
				
			||||||
@@ -306,7 +311,7 @@ class TinyMCEPlugin extends Plugin
 | 
				
			|||||||
                setup: function(ed) {
 | 
					                setup: function(ed) {
 | 
				
			||||||
                    noticeForm.append('<input type="hidden" name="richedit" value="1">');
 | 
					                    noticeForm.append('<input type="hidden" name="richedit" value="1">');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    $('#notice_action-submit').click(function() {
 | 
					                    form.find('.submit:first').click(function() {
 | 
				
			||||||
                        tinymce.triggerSave();
 | 
					                        tinymce.triggerSave();
 | 
				
			||||||
                    });
 | 
					                    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -319,14 +324,15 @@ class TinyMCEPlugin extends Plugin
 | 
				
			|||||||
                        SN.U.Counter(noticeForm);
 | 
					                        SN.U.Counter(noticeForm);
 | 
				
			||||||
                    });
 | 
					                    });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    $('#'+SN.C.S.NoticeDataAttach).change(function() {
 | 
					                    form.find('input[type=file]').change(function() {
 | 
				
			||||||
                        var img = '<img src="{$placeholder}" class="placeholder" width="320" height="240">';
 | 
					                        var img = '<img src="{$placeholder}" class="placeholder" width="320" height="240">';
 | 
				
			||||||
                        var html = tinyMCE.activeEditor.getContent();
 | 
					                        var html = tinyMCE.activeEditor.getContent();
 | 
				
			||||||
                        ed.setContent(html + img);
 | 
					                        ed.setContent(html + img);
 | 
				
			||||||
                    });
 | 
					                    });
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
        });
 | 
					        };
 | 
				
			||||||
 | 
					        })();
 | 
				
			||||||
END_OF_SCRIPT;
 | 
					END_OF_SCRIPT;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return $scr;
 | 
					        return $scr;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user