Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdfd4b5a

Browse files
authored
Merge branch 'main' into all-contributors/add-sanderelias
2 parents5acbdbb +977a08a commitdfd4b5a

File tree

7 files changed

+21
-12
lines changed

7 files changed

+21
-12
lines changed

‎.all-contributorsrc‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
"contributions": [
5050
"doc",
5151
"infra",
52-
"maintenance"
52+
"maintenance",
53+
"code"
5354
]
5455
},
5556
{
@@ -243,6 +244,14 @@
243244
]
244245
},
245246
{
247+
"login":"viceice",
248+
"name":"Michael Kriese",
249+
"avatar_url":"https://avatars.githubusercontent.com/u/1798109?v=4",
250+
"profile":"https://visualon.de",
251+
"contributions": [
252+
"infra"
253+
]
254+
},
246255
"login":"connorsmith-pf",
247256
"name":"Connor Smith",
248257
"avatar_url":"https://avatars.githubusercontent.com/u/80120827?v=4",

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Documentation and examples:
2525
<td align="center" valign="top" width="14.28%"><a href="https://beeman.dev/"><img src="https://avatars.githubusercontent.com/u/36491?v=4?s=100" width="100px;" alt="Bram Borggreve"/><br /><sub><b>Bram Borggreve</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=beeman" title="Code">💻</a> <a href="#maintenance-beeman" title="Maintenance">🚧</a></td>
2626
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SanderElias"><img src="https://avatars.githubusercontent.com/u/1249083?v=4?s=100" width="100px;" alt="Sander Elias"/><br /><sub><b>Sander Elias</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=SanderElias" title="Code">💻</a> <a href="#maintenance-SanderElias" title="Maintenance">🚧</a> <a href="https://github.com/angular-split/angular-split/commits?author=SanderElias" title="Tests">⚠️</a></td>
2727
<td align="center" valign="top" width="14.28%"><a href="https://jefiozie.github.io"><img src="https://avatars.githubusercontent.com/u/17835373?v=4?s=100" width="100px;" alt="Jeffrey Bosch"/><br /><sub><b>Jeffrey Bosch</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=Jefiozie" title="Documentation">📖</a> <a href="#infra-Jefiozie" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Jefiozie" title="Maintenance">🚧</a></td>
28+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SanderElias"><img src="https://avatars.githubusercontent.com/u/1249083?v=4?s=100" width="100px;" alt="Sander Elias"/><br /><sub><b>Sander Elias</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=SanderElias" title="Code">💻</a> <a href="#maintenance-SanderElias" title="Maintenance">🚧</a></td>
29+
<td align="center" valign="top" width="14.28%"><a href="https://jefiozie.github.io"><img src="https://avatars.githubusercontent.com/u/17835373?v=4?s=100" width="100px;" alt="Jeffrey Bosch"/><br /><sub><b>Jeffrey Bosch</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=Jefiozie" title="Documentation">📖</a> <a href="#infra-Jefiozie" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-Jefiozie" title="Maintenance">🚧</a> <a href="https://github.com/angular-split/angular-split/commits?author=Jefiozie" title="Code">💻</a></td>
2830
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Harpush"><img src="https://avatars.githubusercontent.com/u/30085989?v=4?s=100" width="100px;" alt="Harpush"/><br /><sub><b>Harpush</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=Harpush" title="Code">💻</a> <a href="#maintenance-Harpush" title="Maintenance">🚧</a></td>
2931
<td align="center" valign="top" width="14.28%"><a href="http://www.novel-t.ch"><img src="https://avatars.githubusercontent.com/u/46479127?v=4?s=100" width="100px;" alt="Louis Frament"/><br /><sub><b>Louis Frament</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=lf-novelt" title="Code">💻</a></td>
3032
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shemesh"><img src="https://avatars.githubusercontent.com/u/2488980?v=4?s=100" width="100px;" alt="Shemesh"/><br /><sub><b>Shemesh</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=shemesh" title="Code">💻</a></td>
@@ -52,6 +54,7 @@ Documentation and examples:
5254
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kmmccafferty96"><img src="https://avatars.githubusercontent.com/u/10471269?v=4?s=100" width="100px;" alt="Keegan McCafferty"/><br /><sub><b>Keegan McCafferty</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=kmmccafferty96" title="Code">💻</a></td>
5355
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aszechlicki"><img src="https://avatars.githubusercontent.com/u/9299507?v=4?s=100" width="100px;" alt="aszechlicki"/><br /><sub><b>aszechlicki</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=aszechlicki" title="Code">💻</a></td>
5456
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Gwe-n"><img src="https://avatars.githubusercontent.com/u/66947157?v=4?s=100" width="100px;" alt="Gwen"/><br /><sub><b>Gwen</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=gwe-n" title="Code">💻</a></td>
57+
<td align="center" valign="top" width="14.28%"><a href="https://visualon.de"><img src="https://avatars.githubusercontent.com/u/1798109?v=4?s=100" width="100px;" alt="Michael Kriese"/><br /><sub><b>Michael Kriese</b></sub></a><br /><a href="#infra-viceice" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
5558
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ConnorSmith-pf"><img src="https://avatars.githubusercontent.com/u/80120827?v=4?s=100" width="100px;" alt="Connor Smith"/><br /><sub><b>Connor Smith</b></sub></a><br /><a href="https://github.com/angular-split/angular-split/commits?author=connorsmith-pf" title="Code">💻</a></td>
5659
</tr>
5760
</tbody>

‎projects/angular-split/src/lib/angular-split-config.token.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function provideAngularSplitOptions(options: Partial<AngularSplitDefaultO
4040
return{
4141
provide:ANGULAR_SPLIT_DEFAULT_OPTIONS,
4242
useFactory:():AngularSplitDefaultOptions=>({
43-
...inject(ANGULAR_SPLIT_DEFAULT_OPTIONS,{skipSelf:true}),
43+
...(inject(ANGULAR_SPLIT_DEFAULT_OPTIONS,{skipSelf:true,optional:true})??defaultOptions),
4444
...options,
4545
}),
4646
}

‎projects/angular-split/src/lib/split/split.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,13 @@ export class SplitComponent {
254254
areaBeforeGutterIndex:number,
255255
areaAfterGutterIndex:number,
256256
){
257+
e.preventDefault()
258+
e.stopPropagation()
259+
257260
if(this.disabled()){
258261
return
259262
}
260263

261-
e.preventDefault()
262-
e.stopPropagation()
263-
264264
this.gutterMouseDownSubject.next({
265265
mouseDownEvent:e,
266266
gutterElement,

‎src/app/examples/dir-rtl/dir-rtl.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import{ChangeDetectionStrategy,Component,HostBinding}from'@angular/core'
2-
import{SplitComponent,SplitDir,SplitDirection}from'angular-split'
3-
import{SplitAreaComponent}from'projects/angular-split/src/public_api'
2+
import{SplitAreaComponent,SplitComponent,SplitDir,SplitDirection}from'angular-split'
43
import{ExampleTitleComponent}from'src/app/ui/components/exampleTitle.component'
54
import{AComponent}from'../../ui/components/AComponent'
65

‎src/app/examples/split-transitions/split-transitions.component.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import{NgClass}from'@angular/common'
22
import{ChangeDetectionStrategy,Component,ElementRef,HostBinding,viewChild}from'@angular/core'
3-
import{SplitAreaSize,SplitComponent}from'angular-split'
4-
import{SplitAreaComponent}from'projects/angular-split/src/public_api'
3+
import{SplitAreaComponent,SplitAreaSize,SplitComponent}from'angular-split'
54
import{ExampleTitleComponent}from'src/app/ui/components/exampleTitle.component'
65
import{AComponent}from'../../ui/components/AComponent'
76
import{formatDate}from'../../utils/format-date'
@@ -268,7 +267,7 @@ export class SplitTransitionsComponent extends AComponent {
268267
setTimeout(()=>{
269268
constlogsEl=this.logsEl()
270269
if(logsEl.nativeElement.scroll){
271-
(<HTMLElement>logsEl.nativeElement).scroll({top:this.logMessages.length*30})
270+
;(<HTMLElement>logsEl.nativeElement).scroll({top:this.logMessages.length*30})
272271
}
273272
})
274273
}

‎src/app/examples/workspace-localstorage/workspace-localstorage.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import{ChangeDetectionStrategy,Component,OnInit}from'@angular/core'
2-
import{SplitAreaComponent,SplitAreaSize,SplitGutterInteractionEvent}from'angular-split'
2+
import{SplitAreaComponent,SplitAreaSize,SplitComponent,SplitGutterInteractionEvent}from'angular-split'
33
import{ExampleTitleComponent}from'src/app/ui/components/exampleTitle.component'
44
import{AComponent}from'../../ui/components/AComponent'
5-
import{SplitComponent}from'projects/angular-split/src/public_api'
65

76
interfaceIConfig{
87
columns:Array<{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp