mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	message_edit: Display the error banners in the correct place.
Fixes: #25412.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							0756ac9250
						
					
				
				
					commit
					96680e95fb
				
			@@ -12,6 +12,7 @@ import * as blueslip from "./blueslip";
 | 
				
			|||||||
import * as channel from "./channel";
 | 
					import * as channel from "./channel";
 | 
				
			||||||
import * as compose from "./compose";
 | 
					import * as compose from "./compose";
 | 
				
			||||||
import * as compose_actions from "./compose_actions";
 | 
					import * as compose_actions from "./compose_actions";
 | 
				
			||||||
 | 
					import * as compose_banner from "./compose_banner";
 | 
				
			||||||
import * as compose_ui from "./compose_ui";
 | 
					import * as compose_ui from "./compose_ui";
 | 
				
			||||||
import * as composebox_typeahead from "./composebox_typeahead";
 | 
					import * as composebox_typeahead from "./composebox_typeahead";
 | 
				
			||||||
import * as condense from "./condense";
 | 
					import * as condense from "./condense";
 | 
				
			||||||
@@ -967,11 +968,15 @@ export function save_message_row_edit($row) {
 | 
				
			|||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                hide_message_edit_spinner($row);
 | 
					                hide_message_edit_spinner($row);
 | 
				
			||||||
                const message = channel.xhr_error_message(
 | 
					                const message = channel.xhr_error_message(null, xhr);
 | 
				
			||||||
                    $t({defaultMessage: "Error saving edit"}),
 | 
					                const $container = compose_banner.get_compose_banner_container(
 | 
				
			||||||
                    xhr,
 | 
					                    $row.find("textarea"),
 | 
				
			||||||
 | 
					                );
 | 
				
			||||||
 | 
					                compose_banner.show_error_message(
 | 
				
			||||||
 | 
					                    message,
 | 
				
			||||||
 | 
					                    compose_banner.CLASSNAMES.generic_compose_error,
 | 
				
			||||||
 | 
					                    $container,
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
                $row.find(".edit_error").text(message).show();
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,5 +43,4 @@
 | 
				
			|||||||
            {{/if}}
 | 
					            {{/if}}
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <div class="alert alert-error edit_error hide"></div>
 | 
					 | 
				
			||||||
</form>
 | 
					</form>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user