@silexlabs/silex 3.0.0-alpha.64 → 3.0.0-alpha.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,6 +26,7 @@ import { onAll } from './utils';
26
26
  // Properties names used to store the original methods on the components and styles
27
27
  const ATTRIBUTE_METHOD_STORE_HTML = 'tmp-pre-publication-transformer-tohtml';
28
28
  const ATTRIBUTE_METHOD_STORE_SRC = 'tmp-pre-publication-transformer-src';
29
+ const ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC = 'tmp-pre-publication-transformer-attributes-src';
29
30
  const ATTRIBUTE_METHOD_STORE_INLINE_CSS = 'tmp-pre-publication-transformer-inline-css';
30
31
  const ATTRIBUTE_METHOD_STORE_HREF = 'tmp-pre-publication-transformer-href';
31
32
  const ATTRIBUTE_METHOD_STORE_CSS = 'tmp-pre-publication-transformer-tocss';
@@ -78,16 +79,19 @@ export function renderComponents(editor) {
78
79
  });
79
80
  //}
80
81
  }
81
- //if(c.get('attributes').src) {
82
- // c[ATTRIBUTE_METHOD_STORE_SRC] = c.get('attributes').src
83
- // const src = transformPermalink(editor, c.get('attributes').src, ClientSideFileType.ASSET)
84
- // c.set('attributes', {
85
- // ...c.get('attributes'),
86
- // src,
87
- // })
88
- //}
82
+ // Handle both c.attributes.src and c.attributes.attributes.src
83
+ // For some reason we need both
84
+ // Especially when the component is not on the current page, we need c.attributes.attributes.src
85
+ if (c.get('attributes').src) {
86
+ c[ATTRIBUTE_METHOD_STORE_SRC] = c.get('attributes').src;
87
+ const src = transformPermalink(editor, c.get('attributes').src, ClientSideFileType.ASSET);
88
+ c.set('attributes', {
89
+ ...c.get('attributes'),
90
+ src,
91
+ });
92
+ }
89
93
  if (c.get('src')) {
90
- c[ATTRIBUTE_METHOD_STORE_SRC] = c.get('src');
94
+ c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC] = c.get('src');
91
95
  const src = transformPermalink(editor, c.get('src'), ClientSideFileType.ASSET);
92
96
  c.set('src', src);
93
97
  }
@@ -207,17 +211,17 @@ export function resetRenderComponents(editor) {
207
211
  c.getStyle = c[ATTRIBUTE_METHOD_STORE_INLINE_CSS];
208
212
  delete c[ATTRIBUTE_METHOD_STORE_INLINE_CSS];
209
213
  }
210
- //if(c[ATTRIBUTE_METHOD_STORE_SRC]) {
211
- // c.set('attributes', {
212
- // ...c.get('attributes'),
213
- // src: c[ATTRIBUTE_METHOD_STORE_SRC],
214
- // })
215
- // delete c[ATTRIBUTE_METHOD_STORE_SRC]
216
- //}
217
214
  if (c[ATTRIBUTE_METHOD_STORE_SRC]) {
218
- c.set('src', c[ATTRIBUTE_METHOD_STORE_SRC]);
215
+ c.set('attributes', {
216
+ ...c.get('attributes'),
217
+ src: c[ATTRIBUTE_METHOD_STORE_SRC],
218
+ });
219
219
  delete c[ATTRIBUTE_METHOD_STORE_SRC];
220
220
  }
221
+ if (c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC]) {
222
+ c.set('src', c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC]);
223
+ delete c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC];
224
+ }
221
225
  if (c[ATTRIBUTE_METHOD_STORE_HREF]) {
222
226
  c.set('attributes', {
223
227
  ...c.get('attributes'),
@@ -1 +1 @@
1
- {"version":3,"file":"publication-transformers.js","sourceRoot":"","sources":["../../../../src/ts/client/publication-transformers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publication-transformers.js","sourceRoot":"","sources":["../../../../src/ts/client/publication-transformers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@silexlabs/silex",
3
3
  "description": "Free and easy website builder for everyone.",
4
- "version": "3.0.0-alpha.64",
4
+ "version": "3.0.0-alpha.66",
5
5
  "version:backwardcompat": "3.0.0",
6
6
  "author": {
7
7
  "name": "Alex Hoyau",
@@ -132,7 +132,7 @@ describe('publication-transformers', () => {
132
132
  transformPermalink.mockReturnValue(transformedSrc)
133
133
  renderComponents(editor)
134
134
  const html = editor.getHtml()
135
- expect(transformPermalink).toBeCalledTimes(1)
135
+ expect(transformPermalink).toBeCalledTimes(2) // 2x because of c.attributes.src and c.attributes.attributes.src
136
136
  expect(transformPermalink.mock.calls[0][0]).toBe('test.png')
137
137
  expect(transformPermalink.mock.calls[0][1]).toBe('asset')
138
138
  })
@@ -31,6 +31,7 @@ import { getPageLink, getPageSlug } from '../page'
31
31
  // Properties names used to store the original methods on the components and styles
32
32
  const ATTRIBUTE_METHOD_STORE_HTML = 'tmp-pre-publication-transformer-tohtml'
33
33
  const ATTRIBUTE_METHOD_STORE_SRC = 'tmp-pre-publication-transformer-src'
34
+ const ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC = 'tmp-pre-publication-transformer-attributes-src'
34
35
  const ATTRIBUTE_METHOD_STORE_INLINE_CSS = 'tmp-pre-publication-transformer-inline-css'
35
36
  const ATTRIBUTE_METHOD_STORE_HREF = 'tmp-pre-publication-transformer-href'
36
37
  const ATTRIBUTE_METHOD_STORE_CSS = 'tmp-pre-publication-transformer-tocss'
@@ -104,16 +105,19 @@ export function renderComponents(editor: Editor) {
104
105
  })
105
106
  //}
106
107
  }
107
- //if(c.get('attributes').src) {
108
- // c[ATTRIBUTE_METHOD_STORE_SRC] = c.get('attributes').src
109
- // const src = transformPermalink(editor, c.get('attributes').src, ClientSideFileType.ASSET)
110
- // c.set('attributes', {
111
- // ...c.get('attributes'),
112
- // src,
113
- // })
114
- //}
108
+ // Handle both c.attributes.src and c.attributes.attributes.src
109
+ // For some reason we need both
110
+ // Especially when the component is not on the current page, we need c.attributes.attributes.src
111
+ if(c.get('attributes').src) {
112
+ c[ATTRIBUTE_METHOD_STORE_SRC] = c.get('attributes').src
113
+ const src = transformPermalink(editor, c.get('attributes').src, ClientSideFileType.ASSET)
114
+ c.set('attributes', {
115
+ ...c.get('attributes'),
116
+ src,
117
+ })
118
+ }
115
119
  if(c.get('src')) {
116
- c[ATTRIBUTE_METHOD_STORE_SRC] = c.get('src')
120
+ c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC] = c.get('src')
117
121
  const src = transformPermalink(editor, c.get('src'), ClientSideFileType.ASSET)
118
122
  c.set('src', src)
119
123
  }
@@ -233,17 +237,17 @@ export function resetRenderComponents(editor: Editor) {
233
237
  c.getStyle = c[ATTRIBUTE_METHOD_STORE_INLINE_CSS]
234
238
  delete c[ATTRIBUTE_METHOD_STORE_INLINE_CSS]
235
239
  }
236
- //if(c[ATTRIBUTE_METHOD_STORE_SRC]) {
237
- // c.set('attributes', {
238
- // ...c.get('attributes'),
239
- // src: c[ATTRIBUTE_METHOD_STORE_SRC],
240
- // })
241
- // delete c[ATTRIBUTE_METHOD_STORE_SRC]
242
- //}
243
240
  if(c[ATTRIBUTE_METHOD_STORE_SRC]) {
244
- c.set('src', c[ATTRIBUTE_METHOD_STORE_SRC])
241
+ c.set('attributes', {
242
+ ...c.get('attributes'),
243
+ src: c[ATTRIBUTE_METHOD_STORE_SRC],
244
+ })
245
245
  delete c[ATTRIBUTE_METHOD_STORE_SRC]
246
246
  }
247
+ if(c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC]) {
248
+ c.set('src', c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC])
249
+ delete c[ATTRIBUTE_METHOD_STORE_ATTRIBUTES_SRC]
250
+ }
247
251
  if(c[ATTRIBUTE_METHOD_STORE_HREF]) {
248
252
  c.set('attributes', {
249
253
  ...c.get('attributes'),