Issue 484 - Combine Connectors and Contexts into a single column #537
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
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 |
|---|---|---|
|
|
@@ -8,6 +8,10 @@ jQuery(function($){ | |
| $elem = $(record.element), | ||
| icon = ''; | ||
|
|
||
| if ( '- ' === record.text.substring( 0, 2 ) ) { | ||
| record.text = record.text.substring( 2 ); | ||
| } | ||
|
|
||
| if ( undefined !== record.icon ) { | ||
| icon = record.icon; | ||
| } else if ( undefined !== $elem.attr('data-icon') ) { | ||
|
|
@@ -23,12 +27,18 @@ jQuery(function($){ | |
| container.attr('title', $elem.attr('title')); | ||
|
|
||
| return result; | ||
| }, | ||
| formatSelection = function( record ) { | ||
| if ( '- ' === record.text.substring( 0, 2 ) ) { | ||
| record.text = record.text.substring( 2 ); | ||
| } | ||
| return record.text; | ||
| }; | ||
| if ( $(el).find('option').length > 0 ) { | ||
| args = { | ||
| minimumResultsForSearch: 10, | ||
| formatResult: formatResult, | ||
| formatSelection: formatSelection, | ||
| allowClear: true, | ||
| width: '165px' | ||
| }; | ||
|
|
@@ -52,6 +62,7 @@ jQuery(function($){ | |
| } | ||
| }, | ||
| formatResult: formatResult, | ||
| formatSelection: formatSelection, | ||
| initSelection: function (element, callback) { | ||
| var id = $(element).val(); | ||
| if(id !== '') { | ||
|
|
@@ -75,7 +86,28 @@ jQuery(function($){ | |
| }; | ||
| } | ||
|
|
||
| $( el ).select2( args ); | ||
| }); | ||
|
|
||
| var $queryVars = $.getQueryParameters(); | ||
| var $contextInput = $( '.toplevel_page_wp_stream :input.chosen-select[name=context]' ); | ||
|
|
||
| if ( ( 'undefined' === typeof $queryVars.context || '' === $queryVars.context ) && 'undefined' !== typeof $queryVars.connector ) { | ||
| $contextInput.select2( 'val', 'group-' + $queryVars.connector ); | ||
| } | ||
|
|
||
| $('#record-filter-form').submit( function() { | ||
| var $context = $( '.toplevel_page_wp_stream :input.chosen-select[name=context]' ), | ||
| $option = $context.find( 'option:selected' ), | ||
| $connector = $context.parent().find( '.record-filter-connector' ), | ||
| optionConnector = $option.data( 'group' ), | ||
| optionClass = $option.prop( 'class' ); | ||
|
|
||
| $connector.val( optionConnector ); | ||
|
|
||
| if ( 'level-1' === optionClass ) { | ||
| $option.val(''); | ||
| } | ||
| }); | ||
|
|
||
| var stream_select2_change_handler = function (e, input) { | ||
|
|
@@ -756,3 +788,9 @@ jQuery(function($){ | |
| intervals.init( $('.date-interval') ); | ||
| }); | ||
| }); | ||
|
|
||
| jQuery.extend({ | ||
| getQueryParameters : function( str ) { | ||
|
There was a problem hiding this comment. @lukecarbis Do you think we should prefix this function name? Copy pasta straight from: http://css-tricks.com/snippets/jquery/get-query-params-object/ There was a problem hiding this comment. Yes! Good pickup. |
||
| return (str || document.location.search).replace(/(^\?)/,'').split('&').map(function(n){return n = n.split('='),this[n[0]] = n[1],this;}.bind({}))[0]; | ||
| } | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lukecarbis Is this dependent on there being children or shouldn't top level items always be classified as groups?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's 6 vs ½ × 12.
I think it makes the dom a bit cleaner to leave
data-groupout where it's not needed. I'm not that fussed though, if you wanted to change it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK we'll just leave as-is.