-
Notifications
You must be signed in to change notification settings - Fork 967
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/dev' into api.batch
- Loading branch information
Showing
517 changed files
with
14,557 additions
and
60,763 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| .venv/ | ||
| .tox/ | ||
| eggs/ | ||
| client/ | ||
| database/ | ||
| doc/patch.py | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| flake8 `paste .ci/flake8_lint_include_list.txt` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,3 +129,4 @@ doc/build | |
| .DS_Store | ||
| *.rej | ||
| *~ | ||
| .idea/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /** Real-time Communication feature **/ | ||
| define(['mvc/ui/ui-modal'], function( Modal ) { | ||
|
|
||
| var GenericNavView = Backbone.View.extend({ | ||
|
|
||
| initialize: function ( ) { | ||
| this.modal = null; | ||
| }, | ||
|
|
||
| /** makes bootstrap modal and iframe inside it */ | ||
| makeModalIframe: function( e ) { | ||
| // make modal | ||
| var host = window.Galaxy.config.communication_server_host, | ||
| port = window.Galaxy.config.communication_server_port, | ||
| username = escape( window.Galaxy.user.attributes.username ), | ||
| persistent_communication_rooms = escape( window.Galaxy.config.persistent_communication_rooms ), | ||
| query_string = "?username=" + username + "&persistent_communication_rooms=" + persistent_communication_rooms, | ||
| src = host + ":" + port + query_string, | ||
| $el_chat_modal_header = null, | ||
| $el_chat_modal_body = null, | ||
| iframe_template = '<iframe class="f-iframe fade in communication-iframe" src="' + src + '"> </iframe>', | ||
| header_template = '<i class="fa fa-comment" aria-hidden="true" title="Communicate with other users"></i>' + | ||
| '<i class="fa fa-expand expand-compress-modal" aria-hidden="true" title="Maximize"></i>' + | ||
| '<i class="fa fa-times close-modal" aria-hidden="true" title="Close"></i>', | ||
| frame_height = 350, | ||
| frame_width = 600, | ||
| class_names = 'ui-modal chat-modal'; | ||
|
|
||
| // deletes the chat modal if already present and create one | ||
| if( $( '.chat-modal' ).length > 0 ) { | ||
| $( '.chat-modal' ).remove(); | ||
| } | ||
| // creates a modal | ||
| GenericNavView.modal = new Modal.View({ | ||
| body : iframe_template, | ||
| height : frame_height, | ||
| width : frame_width, | ||
| closing_events : true, | ||
| title_separator : false, | ||
| cls : class_names | ||
| }); | ||
|
|
||
| // shows modal | ||
| GenericNavView.modal.show(); | ||
| $el_chat_modal_header = $( '.chat-modal .modal-header' ); | ||
| $el_chat_modal_body = $( '.chat-modal .modal-body' ); | ||
| // adjusts the css of bootstrap modal for chat | ||
| $el_chat_modal_header.addClass('modal-header-body'); | ||
| $el_chat_modal_body.addClass('modal-header-body'); | ||
| $el_chat_modal_header.find( 'h4' ).remove(); | ||
| $el_chat_modal_header.removeAttr( 'min-height padding border' ); | ||
| $el_chat_modal_header.append( header_template ); | ||
| // click event of the close button for chat | ||
| $( '.close-modal' ).click(function( e ) { | ||
| $( '.chat-modal' ).css( 'display', 'none' ); | ||
| }); | ||
| // click event of expand and compress icon | ||
| $( '.expand-compress-modal' ).click(function( e ) { | ||
| if( $( '.expand-compress-modal' ).hasClass( 'fa-expand' ) ) { | ||
| $( '.chat-modal .modal-dialog' ).width( '1000px' ); | ||
| $( '.chat-modal .modal-body' ).height( '575px' ); | ||
| $( '.expand-compress-modal' ).removeClass( 'fa-expand' ).addClass( 'fa-compress' ); | ||
| $( '.expand-compress-modal' ).attr('title', 'Minimize'); | ||
| $( '.expand-compress-modal' ).css('margin-left', '96.2%'); | ||
| } | ||
| else { | ||
| $( '.chat-modal .modal-dialog' ).width( frame_width + 'px' ); | ||
| $( '.chat-modal .modal-body' ).height( frame_height + 'px' ); | ||
| $( '.expand-compress-modal' ).removeClass( 'fa-compress' ).addClass( 'fa-expand' ); | ||
| $( '.expand-compress-modal' ).attr('title', 'Maximize'); | ||
| $( '.expand-compress-modal' ).css('margin-left', '93.2%'); | ||
| } | ||
|
|
||
| }); | ||
| return this; | ||
| }, | ||
|
|
||
| /**renders the chat icon as a nav item*/ | ||
| render: function() { | ||
| var self = this, | ||
| navItem = {}; | ||
| navItem = { | ||
| id : 'show-chat-online', | ||
| icon : 'fa-comment-o', | ||
| tooltip : 'Chat online', | ||
| visible : false, | ||
| onclick : self.makeModalIframe | ||
| } | ||
| return navItem; | ||
| } | ||
| }); | ||
|
|
||
| return { | ||
| GenericNavView : GenericNavView | ||
| }; | ||
|
|
||
| }); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.