This repository has been archived by the owner on Oct 8, 2021. It is now read-only.
Gallery page performance improvements #3289
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ | |
| "<div class='ui-title'>" + label.getEncodedText() + "</div>"+ | ||
| "</div>"+ | ||
| "<div data-" + $.mobile.ns + "role='content'></div>"+ | ||
| "</div>" ), | ||
|
|
||
| listbox = $("<div>", { "class": "ui-selectmenu ui-selectmenu-hidden ui-overlay-shadow ui-corner-all ui-body-" + widget.options.overlayTheme + " " + $.mobile.defaultDialogTransition } ).insertAfter(screen), | ||
|
|
||
|
|
@@ -44,9 +44,9 @@ | |
| "class": "ui-btn-left" | ||
| }).attr( "data-" + $.mobile.ns + "iconpos", "notext" ).attr( "data-" + $.mobile.ns + "icon", "delete" ).appendTo( header ).buttonMarkup(), | ||
|
|
||
| menuPageContent, | ||
| menuPageClose; | ||
|
|
||
|
|
||
| $.extend( widget, { | ||
|
|
@@ -316,6 +316,11 @@ | |
| } | ||
|
|
||
| if ( menuHeight > screenHeight - 80 || !$.support.scrollTop ) { | ||
|
|
||
| self.menuPage.appendTo( $.mobile.pageContainer ).page(); | ||
| self.menuPageContent = menuPage.find( ".ui-content" ); | ||
| self.menuPageClose = menuPage.find( ".ui-header a" ); | ||
|
|
||
| // prevent the parent page from being removed from the DOM, | ||
| // otherwise the results of selecting a list item in the dialog | ||
| // fall into a black hole | ||
|
|
@@ -408,49 +413,63 @@ | |
|
|
||
| self.list.empty().filter( ".ui-listview" ).listview( "destroy" ); | ||
|
|
||
| var $options = self.select.find("option"), | ||
| numOptions = $options.length, | ||
| select = this.select[ 0 ], | ||
| dataPrefix = 'data-' + $.mobile.ns, | ||
| dataIndexAttr = dataPrefix + 'option-index', | ||
| dataIconAttr = dataPrefix + 'icon', | ||
| dataRoleAttr = dataPrefix + 'role', | ||
| fragment = document.createDocumentFragment(), | ||
| optGroup; | ||
|
|
||
| for (var i = 0; i < numOptions;i++){ | ||
| var option = $options[i], | ||
| $option = $(option), | ||
| parent = option.parentNode, | ||
| text = $option.text(), | ||
| anchor = document.createElement('a'); | ||
| classes = []; | ||
|
|
||
| anchor.setAttribute('href','#'); | ||
| anchor.appendChild(document.createTextNode(text)); | ||
|
|
||
| // Are we inside an optgroup? | ||
| if (parent !== select && parent.nodeName.toLowerCase() === "optgroup"){ | ||
| var optLabel = parent.getAttribute('label'); | ||
| if ( optLabel != optGroup) { | ||
| var divider = document.createElement('li'); | ||
| divider.setAttribute(dataRoleAttr,'list-divider'); | ||
| divider.setAttribute('role','option'); | ||
| divider.setAttribute('tabindex','-1'); | ||
| divider.appendChild(document.createTextNode(optLabel)); | ||
| fragment.appendChild(divider); | ||
| optGroup = optLabel; | ||
| } | ||
| } | ||
|
|
||
| if (!placeholder && (!option.getAttribute( "value" ) || text.length == 0 || $option.jqmData( "placeholder" )) ) { | ||
| if ( o.hidePlaceholderMenuItems ) { | ||
| classes.push( "ui-selectmenu-placeholder" ); | ||
| } | ||
| placeholder = self.placeholder = text; | ||
| } | ||
| var item = document.createElement('li'); | ||
| if ( option.disabled ) { | ||
| classes.push( "ui-disabled" ); | ||
| item.setAttribute('aria-disabled',true); | ||
| } | ||
| item.setAttribute(dataIndexAttr,i); | ||
| item.setAttribute(dataIconAttr,dataIcon); | ||
| item.setAttribute('class',classes.join(" ")); | ||
|
There was a problem hiding this comment. I can't recall but will this cause an issue in ie7? There was a problem hiding this comment. Note: I'm like | | close to merging this into master. There was a problem hiding this comment. Hi @johnbender, There was a problem hiding this comment. @johnbender, the improvement mentioned above has been done |
||
| item.setAttribute('role','option'); | ||
| item.setAttribute('tabindex','-1'); | ||
| item.appendChild(anchor); | ||
| fragment.appendChild(item); | ||
| } | ||
| fragment.firstChild.setAttribute('tabindex',0); | ||
| self.list[0].appendChild(fragment); | ||
|
|
||
| // Hide header close link for single selects | ||
| if ( !this.isMultiple ) { | ||
|
|
||
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,55 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <title>jQuery Mobile Docs - Checkboxradio</title> | ||
| <link rel="stylesheet" href="../../css/themes/default/" /> | ||
| <script src="../../js/jquery.js"></script> | ||
| <script src="../../js/"></script> | ||
| </head> | ||
| <body> | ||
|
|
||
| <div data-role="page"> | ||
|
|
||
| <div data-role="header"> | ||
| <h1>Checkboxradio</h1> | ||
| </div><!-- /header --> | ||
|
|
||
| <div data-role="content" data-filter="true"> | ||
|
|
||
| <input type="checkbox" name="checkbox1" id="checkbox1" /> | ||
| <label for="checkbox1">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox2" id="checkbox2" /> | ||
| <label for="checkbox2">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox3" id="checkbox3" /> | ||
| <label for="checkbox3">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox4" id="checkbox4" /> | ||
| <label for="checkbox4">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox5" id="checkbox5" /> | ||
| <label for="checkbox5">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox6" id="checkbox6" /> | ||
| <label for="checkbox6">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox7" id="checkbox7" /> | ||
| <label for="checkbox7">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox8" id="checkbox8" /> | ||
| <label for="checkbox8">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox9" id="checkbox9" /> | ||
| <label for="checkbox9">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox10" id="checkbox10" /> | ||
| <label for="checkbox10">Checkbox</label> | ||
|
|
||
| </div><!-- /content --> | ||
| </div><!-- /page --> | ||
|
|
||
| </body> | ||
| </html> |
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,57 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <title>jQuery Mobile Docs - Checkboxradio</title> | ||
| <link rel="stylesheet" href="../../css/themes/default/" /> | ||
| <script src="../../js/jquery.js"></script> | ||
| <script type="text/javascript" src="stats/perf.js"></script> | ||
| <script type="text/javascript" src="stats/startup.js"></script> | ||
| <script src="../../js/"></script> | ||
| </head> | ||
| <body> | ||
|
|
||
| <div data-role="page" id="perf-test-page"> | ||
|
|
||
| <div data-role="header"> | ||
| <h1>Checkboxradio</h1> | ||
| </div><!-- /header --> | ||
|
|
||
| <div data-role="content" data-filter="true"> | ||
|
|
||
| <input type="checkbox" name="checkbox1" id="checkbox1" /> | ||
| <label for="checkbox1">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox2" id="checkbox2" /> | ||
| <label for="checkbox2">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox3" id="checkbox3" /> | ||
| <label for="checkbox3">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox4" id="checkbox4" /> | ||
| <label for="checkbox4">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox5" id="checkbox5" /> | ||
| <label for="checkbox5">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox6" id="checkbox6" /> | ||
| <label for="checkbox6">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox7" id="checkbox7" /> | ||
| <label for="checkbox7">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox8" id="checkbox8" /> | ||
| <label for="checkbox8">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox9" id="checkbox9" /> | ||
| <label for="checkbox9">Checkbox</label> | ||
|
|
||
| <input type="checkbox" name="checkbox10" id="checkbox10" /> | ||
| <label for="checkbox10">Checkbox</label> | ||
|
|
||
| </div><!-- /content --> | ||
| </div><!-- /page --> | ||
|
|
||
| </body> | ||
| </html> |
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.
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.
Is there ever a case where the parent might be a select node and also have a
nodeNameof optgroup? Or is this just to short circuit quickly before a string comparison where possible?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.
We iterate only through elements in the loop and their parent might be < select > or < optgroup >. nodeName is a read only property that always returns tag name for a nodes so we have ‘select’ or ‘optgroup’.
Thus basically we can just perform 'parent !== select' comparison which should run faster. The second part is for the possible future changes. I will double check the performance improvement using this statement and add additional comment to code.