Skip to content

Fix regex of iconsCacher - #10326

Merged
MorrisJobke merged 4 commits into
masterfrom
svg-api-suf-fixes
Jul 24, 2018
Merged

Fix regex of iconsCacher#10326
MorrisJobke merged 4 commits into
masterfrom
svg-api-suf-fixes

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Jul 21, 2018

Copy link
Copy Markdown
Member

@skjnldsvskjnldsv added bug 3. to review Waiting for reviews feature: caching Related to our caching system: scssCacher, jsCombiner... labels Jul 21, 2018
@skjnldsvskjnldsv added this to the Nextcloud 14 milestone Jul 21, 2018
@skjnldsvskjnldsv self-assigned this Jul 21, 2018
juliusknorr
juliusknorr reviewed Jul 21, 2018
View reviewed changes
Comment threadlib/private/Template/IconsCacher.php Outdated

/** @var string */
private $iconVarRE = '/--(icon-[a-z0-9-]+): url\(["\']([a-z0-9-_\~\/\?\&\=\.]+)[^;]+;/m';
private $iconVarRE = '/--(icon-[a-z0-9-]+): url\(["\']([a-z0-9-_\~\/\.]+)[^;]+;/m';

@juliusknorrjuliusknorrJul 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just recognized it might make sense to also allow uppercase chars

@skjnldsvskjnldsvJul 21, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes I guess :)

rullzer
rullzer approved these changes Jul 21, 2018
View reviewed changes

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory fine. But I always like it is we have test for stuff like this.

@skjnldsvskjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jul 22, 2018
@skjnldsv

skjnldsv commented Jul 22, 2018

Copy link
Copy Markdown
MemberAuthor

Right! Let me add tests :)

@MorrisJobke

MorrisJobke commented Jul 24, 2018

Copy link
Copy Markdown
Member

Now I get this instead:

[Error] Failed to load resource: the server responded with a status of 404 (Not Found) (000, line 0) http://localhost:8000/index.php/svg/core/files/star-dark/000?v=1

@MorrisJobkeMorrisJobke mentioned this pull request Jul 24, 2018
Merged
21 tasks
@skjnldsv

skjnldsv commented Jul 24, 2018

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke wrong icon, star_dark comes from core/actions. I'll fix it

@MorrisJobke

MorrisJobke commented Jul 24, 2018

Copy link
Copy Markdown
Member

Just noticed that it was before like this:

http://localhost:8000/index.php/svg/core/files/star-dark/000?v=2?v=1?v=1?v=1?v=1?v=1?v=1?v=1?v=1?v=1

@skjnldsv
Fix header controls sticky positioning
a9e554b
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
Fix regex of iconsCacher
85a481d
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
Uppercase
6bcfe8d
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
new tests
f62d4d1
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv

skjnldsv commented Jul 24, 2018

Copy link
Copy Markdown
MemberAuthor

Tests added!
@nextcloud/designers please review :)

@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jul 24, 2018
@skjnldsv

skjnldsv commented Jul 24, 2018

Copy link
Copy Markdown
MemberAuthor

sh: 1: kill: No such process
Unrelated

@skjnldsvskjnldsv added the 4. to release Ready to be released and/or waiting for tests to finish label Jul 24, 2018
@skjnldsvskjnldsv removed the 3. to review Waiting for reviews label Jul 24, 2018
@MorrisJobke
MorrisJobke merged commit f7c7ff5 into masterJul 24, 2018
@MorrisJobke
MorrisJobke deleted the svg-api-suf-fixes branch July 24, 2018 11:37
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: cachingRelated to our caching system: scssCacher, jsCombiner...

Projects

None yet

Milestone

Nextcloud 14

Development

Successfully merging this pull request may close these issues.

4 participants

@skjnldsv@MorrisJobke@rullzer@juliusknorr