Skip to content

Commit 1b2f90d

Browse files
idseefeldidseefeld
authored
Merge pull request #49 from idseefeld/bugs/fix-image-and-crop-ui-editor
fix package
2 parents e54b4b9 + 3e4ffac commit 1b2f90d

39 files changed

+937
-1490
lines changed

‎src/wysiwgUmbracoCommunityExtensions.TestSite/Views/SimplePage.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@using Umbraco.Cms.Web.Common.PublishedModels;
1+
@using Umbraco.Cms.Web.Common.PublishedModels;
22
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<SimplePage>
33
@{
44
Layout = null;
@@ -33,12 +33,12 @@
3333
</head>
3434
<body id="top">
3535
<div id="canvas">
36-
@await Html.GetBlockGridHtmlAsync(Model.Main)
36+
@await Html.GetBlockGridHtmlAsync(Model.Grid)
3737

3838
<footer>
3939
<a href="/umbraco" target="_blank">backoffice</a>
4040
</footer>
4141

4242
</div>
4343
</body>
44-
</html>
44+
</html>

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/Content/home_yvqbb0ok.config‎

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
<Template Key="628a5696-6175-4f40-9525-0a1b6239e641">SimplePage</Template>
1818
</Info>
1919
<Properties>
20-
<main>
20+
<grid>
2121
<Value><![CDATA[{
2222
"contentData": [
2323
{
24-
"contentTypeKey": "ba8d4b20-786a-48e6-8127-550a489300dc",
25-
"key": "920dd0e5-2c69-4af5-b5c7-472e94eac853",
24+
"contentTypeKey": "eadafa60-6d20-4153-b9fd-af76549c7593",
25+
"key": "e95d478b-dd3b-435b-b301-9ef8e862572a",
2626
"udi": null,
2727
"values": []
2828
},
2929
{
30-
"contentTypeKey": "3d435dcb-9172-44ce-9e87-e18e0be11f28",
31-
"key": "d64cf891-6e10-48e1-bb3f-eb8f73f0de45",
30+
"contentTypeKey": "61d04f73-5c48-426c-ab8f-c5499eb53b8e",
31+
"key": "35e11f56-9602-4adb-a7c5-4387a6edf8d9",
3232
"udi": null,
3333
"values": [
3434
{
@@ -41,8 +41,14 @@
4141
]
4242
},
4343
{
44-
"contentTypeKey": "eb0a9610-5d5f-4beb-bcea-26eddbcf8411",
45-
"key": "a00dc762-4c47-41dc-87a6-1c5b6f91bddc",
44+
"contentTypeKey": "10a679e4-1549-4451-a9a9-471342a34ff7",
45+
"key": "fe02f72e-7667-43de-845f-2acf0ebac3e0",
46+
"udi": null,
47+
"values": []
48+
},
49+
{
50+
"contentTypeKey": "c7421218-786b-4ddd-a156-39675aff3a66",
51+
"key": "845cb6a5-997c-49cc-8311-f3dbc6d2d75c",
4652
"udi": null,
4753
"values": [
4854
{
@@ -52,13 +58,12 @@
5258
"segment": null,
5359
"value": [
5460
{
55-
"selectedCropAlias": "1050x1485",
56-
"key": "ad191aad-2a08-4932-9c5b-a74a65dc6352",
61+
"key": "17b56455-dc55-4db0-a78a-4c8ee3b3e9b8",
5762
"mediaKey": "8ae2a4de-5e24-40f9-8925-5e10c6ecc622",
5863
"mediaTypeAlias": "",
5964
"focalPoint": {
60-
"top": 0.41578618904929177,
61-
"left": 0.28655570678103576
65+
"top": 0.413613345248734,
66+
"left": 0.2928954423592493
6267
},
6368
"crops": [
6469
{
@@ -80,7 +85,7 @@
8085
"height": 1050
8186
}
8287
],
83-
"cropUrl": "/media/kfxkipcn/20171102_111029.jpg?rxy=0.28655570678103576,0.41578618904929177\u0026width=200\u0026height=283\u0026v=1dbbea11bd95ff4"
88+
"selectedCropAlias": "1050x1485"
8489
}
8590
]
8691
},
@@ -91,13 +96,6 @@
9196
"segment": null,
9297
"value": "Dirk"
9398
},
94-
{
95-
"alias": "alternativeText",
96-
"culture": "en-US",
97-
"editorAlias": null,
98-
"segment": null,
99-
"value": "Dirk"
100-
},
10199
{
102100
"alias": "captionColor",
103101
"culture": null,
@@ -111,14 +109,8 @@
111109
]
112110
},
113111
{
114-
"contentTypeKey": "e6b9c21c-7917-45a3-b3d4-a8839e8ce3d1",
115-
"key": "c15c4413-3231-42ca-a795-eeb7cc49e50f",
116-
"udi": null,
117-
"values": []
118-
},
119-
{
120-
"contentTypeKey": "601370d6-c5f9-4c64-933d-e600c03169ad",
121-
"key": "446c07cd-27df-48b2-bbaf-987ad5aa801c",
112+
"contentTypeKey": "f616e92d-624f-42a4-853e-9d83342ee183",
113+
"key": "252a0520-3d8c-4f74-bd8e-9c445e1a6221",
122114
"udi": null,
123115
"values": [
124116
{
@@ -127,7 +119,7 @@
127119
"editorAlias": null,
128120
"segment": null,
129121
"value": {
130-
"markup": "\u003Ch2\u003ELorem Ipsum\u003C/h2\u003E\u003Cp\u003Emore text to come...\u003C/p\u003E\u003Cp\u003E\u003C/p\u003E",
122+
"markup": "\u003Ch2\u003ELorem Ipsum\u003C/h2\u003E\u003Cp\u003Emore text to come...\u003C/p\u003E",
131123
"blocks": {
132124
"contentData": [],
133125
"settingsData": [],
@@ -141,8 +133,8 @@
141133
],
142134
"settingsData": [
143135
{
144-
"contentTypeKey": "725d62eb-8c4b-47dd-a52b-e1c325d87026",
145-
"key": "0a4c853c-5b3b-410f-9197-bc9c1dc67223",
136+
"contentTypeKey": "887f0b06-ea29-4e03-a67d-db6cbc309d57",
137+
"key": "4fce8616-91e8-41a1-8c12-c68526b6dcee",
146138
"udi": null,
147139
"values": [
148140
{
@@ -158,8 +150,8 @@
158150
]
159151
},
160152
{
161-
"contentTypeKey": "4a21c6c9-937e-4e8a-8c20-314ea8f87d32",
162-
"key": "1d2288d2-4287-4bea-908a-e65cd30a9e46",
153+
"contentTypeKey": "0f87941b-0934-44bf-8f91-c2593e75d508",
154+
"key": "9d75615c-643a-4cf8-9b4b-f983a93fec2c",
163155
"udi": null,
164156
"values": [
165157
{
@@ -182,8 +174,8 @@
182174
]
183175
},
184176
{
185-
"contentTypeKey": "725d62eb-8c4b-47dd-a52b-e1c325d87026",
186-
"key": "0f3062ce-4412-401c-9706-bed87a7f7aa2",
177+
"contentTypeKey": "887f0b06-ea29-4e03-a67d-db6cbc309d57",
178+
"key": "ea84e7cd-dafd-4123-a484-86084e779a41",
187179
"udi": null,
188180
"values": [
189181
{
@@ -199,8 +191,8 @@
199191
]
200192
},
201193
{
202-
"contentTypeKey": "22473a2b-50dc-4d4d-85bb-1b31b2164060",
203-
"key": "0594d6ec-7b6e-48ed-91a8-57a428e2fa80",
194+
"contentTypeKey": "f88993f9-1a74-4aad-a779-6c77fc0300f0",
195+
"key": "8ee92d2d-236b-48f8-a811-668f07207bc0",
204196
"udi": null,
205197
"values": [
206198
{
@@ -218,27 +210,27 @@
218210
],
219211
"expose": [
220212
{
221-
"contentKey": "920dd0e5-2c69-4af5-b5c7-472e94eac853",
213+
"contentKey": "e95d478b-dd3b-435b-b301-9ef8e862572a",
222214
"culture": null,
223215
"segment": null
224216
},
225217
{
226-
"contentKey": "d64cf891-6e10-48e1-bb3f-eb8f73f0de45",
218+
"contentKey": "35e11f56-9602-4adb-a7c5-4387a6edf8d9",
227219
"culture": "en-US",
228220
"segment": null
229221
},
230222
{
231-
"contentKey": "a00dc762-4c47-41dc-87a6-1c5b6f91bddc",
232-
"culture": "en-US",
223+
"contentKey": "fe02f72e-7667-43de-845f-2acf0ebac3e0",
224+
"culture": null,
233225
"segment": null
234226
},
235227
{
236-
"contentKey": "c15c4413-3231-42ca-a795-eeb7cc49e50f",
237-
"culture": null,
228+
"contentKey": "845cb6a5-997c-49cc-8311-f3dbc6d2d75c",
229+
"culture": "en-US",
238230
"segment": null
239231
},
240232
{
241-
"contentKey": "446c07cd-27df-48b2-bbaf-987ad5aa801c",
233+
"contentKey": "252a0520-3d8c-4f74-bd8e-9c445e1a6221",
242234
"culture": "en-US",
243235
"segment": null
244236
}
@@ -252,21 +244,21 @@
252244
{
253245
"areas": [],
254246
"columnSpan": 12,
255-
"contentKey": "d64cf891-6e10-48e1-bb3f-eb8f73f0de45",
247+
"contentKey": "35e11f56-9602-4adb-a7c5-4387a6edf8d9",
256248
"contentUdi": null,
257249
"rowSpan": 1,
258-
"settingsKey": "1d2288d2-4287-4bea-908a-e65cd30a9e46",
250+
"settingsKey": "9d75615c-643a-4cf8-9b4b-f983a93fec2c",
259251
"settingsUdi": null
260252
}
261253
],
262-
"key": "8e6a44df-6082-46f2-8907-1f50ca0bede4"
254+
"key": "f7dd88f0-999a-4d25-a926-6e167a79334f"
263255
}
264256
],
265257
"columnSpan": 12,
266-
"contentKey": "920dd0e5-2c69-4af5-b5c7-472e94eac853",
258+
"contentKey": "e95d478b-dd3b-435b-b301-9ef8e862572a",
267259
"contentUdi": null,
268260
"rowSpan": 1,
269-
"settingsKey": "0a4c853c-5b3b-410f-9197-bc9c1dc67223",
261+
"settingsKey": "4fce8616-91e8-41a1-8c12-c68526b6dcee",
270262
"settingsUdi": null
271263
},
272264
{
@@ -276,40 +268,40 @@
276268
{
277269
"areas": [],
278270
"columnSpan": 4,
279-
"contentKey": "a00dc762-4c47-41dc-87a6-1c5b6f91bddc",
271+
"contentKey": "845cb6a5-997c-49cc-8311-f3dbc6d2d75c",
280272
"contentUdi": null,
281273
"rowSpan": 1,
282274
"settingsKey": null,
283275
"settingsUdi": null
284276
}
285277
],
286-
"key": "f8422146-1389-46dd-a8c8-1f435c5d7e75"
278+
"key": "fc28f29c-7373-4ea8-99b2-d1040628be36"
287279
},
288280
{
289281
"items": [
290282
{
291283
"areas": [],
292284
"columnSpan": 8,
293-
"contentKey": "446c07cd-27df-48b2-bbaf-987ad5aa801c",
285+
"contentKey": "252a0520-3d8c-4f74-bd8e-9c445e1a6221",
294286
"contentUdi": null,
295287
"rowSpan": 1,
296-
"settingsKey": "0594d6ec-7b6e-48ed-91a8-57a428e2fa80",
288+
"settingsKey": "8ee92d2d-236b-48f8-a811-668f07207bc0",
297289
"settingsUdi": null
298290
}
299291
],
300-
"key": "1cb718fe-c95a-46c0-bf9c-2caf2814dd6f"
292+
"key": "b8550072-09e7-4238-83fe-c2ad76dbb81a"
301293
}
302294
],
303295
"columnSpan": 12,
304-
"contentKey": "c15c4413-3231-42ca-a795-eeb7cc49e50f",
296+
"contentKey": "fe02f72e-7667-43de-845f-2acf0ebac3e0",
305297
"contentUdi": null,
306298
"rowSpan": 1,
307-
"settingsKey": "0f3062ce-4412-401c-9706-bed87a7f7aa2",
299+
"settingsKey": "ea84e7cd-dafd-4123-a484-86084e779a41",
308300
"settingsUdi": null
309301
}
310302
]
311303
}
312304
}]]></Value>
313-
</main>
305+
</grid>
314306
</Properties>
315307
</Content>

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/ContentTypes/simplepage.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
</Structure>
2626
<GenericProperties>
2727
<GenericProperty>
28-
<Key>c8f32f1b-65d3-4337-bae4-2fd77dd2b348</Key>
29-
<Name>Main</Name>
30-
<Alias>main</Alias>
31-
<Definition>b6960de4-479e-481b-9c05-c5d596d0c00e</Definition>
28+
<Key>9be92e2f-cdc8-42fb-869e-d23c222a0922</Key>
29+
<Name>Grid</Name>
30+
<Alias>grid</Alias>
31+
<Definition>a9ced107-a711-49d4-9f25-922f67905a89</Definition>
3232
<Type>Umbraco.BlockGrid</Type>
3333
<Mandatory>false</Mandatory>
3434
<Validation></Validation>

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/ContentTypes/wysiwg65_croppedpicture.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ContentType Key="859d83d0-eb19-445e-8021-2214ef9a9603" Alias="wysiwg65_croppedPicture" Level="3">
2+
<ContentType Key="c7421218-786b-4ddd-a156-39675aff3a66" Alias="wysiwg65_croppedPicture" Level="3">
33
<Info>
44
<Name>Cropped Picture</Name>
55
<Icon>icon-document-image</Icon>
66
<Thumbnail>folder.png</Thumbnail>
77
<Description></Description>
88
<AllowAtRoot>False</AllowAtRoot>
99
<ListView>00000000-0000-0000-0000-000000000000</ListView>
10-
<Variations>CultureAndSegment</Variations>
10+
<Variations>Culture</Variations>
1111
<IsElement>true</IsElement>
1212
<HistoryCleanup>
1313
<PreventCleanup>False</PreventCleanup>
@@ -22,7 +22,7 @@
2222
<Structure />
2323
<GenericProperties>
2424
<GenericProperty>
25-
<Key>653b4910-49ba-4ba7-9786-24751278a12a</Key>
25+
<Key>6f431324-4e81-4b20-904b-84296f2c10ec</Key>
2626
<Name>Alternative Text</Name>
2727
<Alias>alternativeText</Alias>
2828
<Type>Umbraco.TextBox</Type>
@@ -37,7 +37,7 @@
3737
<LabelOnTop>false</LabelOnTop>
3838
</GenericProperty>
3939
<GenericProperty>
40-
<Key>5a99cc1d-824a-4bce-b1f2-da0ffdecf64b</Key>
40+
<Key>ef82d632-a06c-4c33-a877-d0937ce4d9e2</Key>
4141
<Name>Caption Color</Name>
4242
<Alias>captionColor</Alias>
4343
<Type>Umbraco.ColorPicker</Type>
@@ -52,7 +52,7 @@
5252
<LabelOnTop>false</LabelOnTop>
5353
</GenericProperty>
5454
<GenericProperty>
55-
<Key>47101050-e6e0-4720-9db7-3e37c4af176a</Key>
55+
<Key>fec7a8a8-455e-4157-a7cd-744ce1a6ae03</Key>
5656
<Name>Fig Caption</Name>
5757
<Alias>figCaption</Alias>
5858
<Type>Umbraco.TextBox</Type>
@@ -67,7 +67,7 @@
6767
<LabelOnTop>false</LabelOnTop>
6868
</GenericProperty>
6969
<GenericProperty>
70-
<Key>7a70bb97-2ab2-40be-a4b2-229053241896</Key>
70+
<Key>84ce7a97-8617-44b2-9e38-b56bc13e693c</Key>
7171
<Name>Media Item</Name>
7272
<Alias>mediaItem</Alias>
7373
<Type>Wysiwg.ImageAndCropPicker</Type>
@@ -84,7 +84,7 @@
8484
</GenericProperties>
8585
<Tabs>
8686
<Tab>
87-
<Key>2c41f7c2-6aa0-4756-aa93-d24fbbec0e06</Key>
87+
<Key>93efd8ec-b2ce-4a8f-a1c0-eb3e7450fc2a</Key>
8888
<Caption>Content</Caption>
8989
<Alias>content</Alias>
9090
<Type>Group</Type>

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/ContentTypes/wysiwg65_headline.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ContentType Key="3914ab5c-c93d-496c-bb3c-39e1a4127ca8" Alias="wysiwg65_headline" Level="3">
2+
<ContentType Key="61d04f73-5c48-426c-ab8f-c5499eb53b8e" Alias="wysiwg65_headline" Level="3">
33
<Info>
44
<Name>Headline</Name>
55
<Icon>icon-heading-1</Icon>
66
<Thumbnail>folder.png</Thumbnail>
77
<Description></Description>
88
<AllowAtRoot>False</AllowAtRoot>
99
<ListView>00000000-0000-0000-0000-000000000000</ListView>
10-
<Variations>CultureAndSegment</Variations>
10+
<Variations>Culture</Variations>
1111
<IsElement>true</IsElement>
1212
<HistoryCleanup>
1313
<PreventCleanup>False</PreventCleanup>
@@ -22,7 +22,7 @@
2222
<Structure />
2323
<GenericProperties>
2424
<GenericProperty>
25-
<Key>0d3944d2-7ca0-48ab-8187-36bf56819551</Key>
25+
<Key>60115f2e-b88a-4ad8-8660-7b8487bef050</Key>
2626
<Name>Text</Name>
2727
<Alias>text</Alias>
2828
<Type>Umbraco.TextBox</Type>
@@ -39,7 +39,7 @@
3939
</GenericProperties>
4040
<Tabs>
4141
<Tab>
42-
<Key>2ced4298-e203-415c-aa60-a8fef355eea4</Key>
42+
<Key>f3dbe542-23d3-43df-8826-8b15b2601ca5</Key>
4343
<Caption>Content</Caption>
4444
<Alias>content</Alias>
4545
<Type>Group</Type>

0 commit comments

Comments
 (0)