Code

[wip] Allow long captions#1

Code

Closed

andi34 wants to merge 39 commits intomasterandi34/PhotoSwipe:masterfrom allow_long_captionsandi34/PhotoSwipe:allow_long_captionsCopy head branch name to clipboard

+1,179-803

Commits

Commits on Aug 11, 2020

• website: Fix inline style and indentation (mix of spaces and tabs).

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  2c3e794

  Copy full SHA for 2c3e794

• Rename framework.createEl to framework.createElement for clarity

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  fa8dc3f

  Copy full SHA for fa8dc3f

• Question about fake caption container

  Show description for 21ae260
  

  PeterSweetAndSour

  authored and

  andi34

  committed
  21ae260

  Copy full SHA for 21ae260

• Rename function argument of a DOM node from 'captionEl' to 'captionElement' to avoid confusion with the boolean option of the same name a few lines below.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  203a335

  Copy full SHA for 203a335

• Add some extra whitespace to separate functions.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  c3e971e

  Copy full SHA for c3e971e

• Rename options to make clear that these are booleans, not DOM elements.

  Show description for af9e8d7
  

  PeterSweetAndSour

  authored and

  andi34

  committed
  af9e8d7

  Copy full SHA for af9e8d7

• Capture the calculated size of the image and set an option for the caption to go under the picture and be able to scroll to see it.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  e71b030

  Copy full SHA for e71b030

• Move new option to the UI file.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  e0aa68d

  Copy full SHA for e0aa68d

• Fix whitespace in photoswipe-ui-default.js. Add some explanatory comments.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  14b3c72

  Copy full SHA for 14b3c72

• First pass with something that works. Need to fix z-index on captionElement and arrows and figure out why it is failing on mobile.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  bfb2560

  Copy full SHA for bfb2560

• Add some lines to seperate functions

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  140bdce

  Copy full SHA for 140bdce

• Rename button to be consistent pattern with others. Fix z-index issue so arrows are above expanded caption.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  1d3b1c7

  Copy full SHA for 1d3b1c7

• Fix display/hiding of expand control when switching photos.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  940d898

  Copy full SHA for 940d898

• Set data attributes on .pswp__item to carry initial image height and top/bottom gaps so that caption function can be initiated with just the event. Not sure if this is better or just different.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  dfe1ec5

  Copy full SHA for dfe1ec5

• Rename function to indicate that it is private.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  dcf9926

  Copy full SHA for dcf9926

• Save so far now that positioning is correct. Need to fix hiding and showing.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  38d5dfb

  Copy full SHA for 38d5dfb

• Somewhat closer. Accounting for scale but only on first load. :-( Caption toggles now. Adding more whitespace for clarity.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  398619a

  Copy full SHA for 398619a

• Seems to work.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  dcf57fd

  Copy full SHA for dcf57fd

• Stop accidental scroll on close. Add a box at the end of the caption to indicate the end. Make caption text white so people like me can actually read it.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  ef3c99d

  Copy full SHA for ef3c99d

• Various fixes

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  7048891

  Copy full SHA for 7048891

• Sorted out weirdness with tap behavior. Now preventing closing when tapping on the caption because it is too easy to close accidentally when you thought you were swiping.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  5da7317

  Copy full SHA for 5da7317

• Renaming option name and removing redundant code.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  61e5806

  Copy full SHA for 61e5806

• Drag up on collapsed caption will expand it.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  3fcd840

  Copy full SHA for 3fcd840

• Expand and collapse caption with just the mouse wheel. Had to override _likelyTouchDevice since navigator.maxTouchPoints is reporting 2 on my laptop so need to figure that out next.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  44fabb2

  Copy full SHA for 44fabb2

• Run setupDesktopZoom regardless. As noted in the comment, a timing issue seems to be preventing this running when _likelyTouchDevice is true.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  a69fb0b

  Copy full SHA for a69fb0b

• Swap out two lines of SVG for two dozen lines of CSS to make the expand/collapse arrows without another request to get an image and still have it work on IE11. Now need to get the event to fire whe…

  Show description for 6a80c85
  

  PeterSweetAndSour

  authored and

  andi34

  committed
  6a80c85

  Copy full SHA for 6a80c85

• Back to SVG background images but now Base64 encoded and background size set explicitly so that it will work with IE11.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  e47f580

  Copy full SHA for e47f580

• Reset default for allowLongCaptions to false.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  b3d4525

  Copy full SHA for b3d4525

• Ensure HTML exists for caption control and change title on button when toggling the control.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  e98d6c0

  Copy full SHA for e98d6c0

• Allow left/right buttons to show above expanded caption overlay when viewport is wide enough.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  d6f50fe

  Copy full SHA for d6f50fe

• Now with keyboard control.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  510d5ae

  Copy full SHA for 510d5ae

• Moving the setting of tabindex and focus on the innerCaptionElement to where the keydown events are handled. Also removing some console output.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  e945a8a

  Copy full SHA for e945a8a

• Animate expansion and collapse of caption.

  Show description for a275376
  

  PeterSweetAndSour

  authored and

  andi34

  committed
  a275376

  Copy full SHA for a275376

• Get around cross-site security issue by creating a new stylesheet rather than attempting to manipulate an existing one.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  5b52d5d

  Copy full SHA for 5b52d5d

• A bit of rearrangement as I discovered that dragging to a new photo on a phone does not call the goTo function so the resetCaption function was not getting called which had some odd results.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  d4e2d1d

  Copy full SHA for d4e2d1d

• Increase the width of the caption if long captions are selected.

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  c67b066

  Copy full SHA for c67b066

• Added section for caption expand/collapse by vertical swipe/drag.

  Show description for 78c88f1
  

  PeterSweetAndSour

  authored and

  andi34

  committed
  78c88f1

  Copy full SHA for 78c88f1

• Add "FYI" to console notices explaining that two options are overridden when allowLongCaptions is true.

  Show description for b02454a
  

  PeterSweetAndSour

  authored and

  andi34

  committed
  b02454a

  Copy full SHA for b02454a

• Remove some console output

  

  PeterSweetAndSour

  authored and

  andi34

  committed
  d40b745

  Copy full SHA for d40b745