Skip to content

Commit 5889937

Browse files
frankpaganfrankpagan
committed
fix: remove data- from fetch, pass and filter
1 parent 7854a2e commit 5889937

7 files changed

+45
-45
lines changed

‎demo/fetch.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</head>
88
<body>
99

10-
<div data-template_id="abc1">
10+
<div template_id="abc1">
1111
<div class="template card {{render2.collection}} card margin:10px"
1212
data-value="{{render2.data._id}}"
13-
data-template_id="abc1"
14-
data-render_array="render2.data">
13+
template_id="abc1"
14+
render-array="render2.data">
1515
<div class="card-body padding:15px" collection="{{render2.collection}}">
1616
<h3 class="{{render2.data.firstname}} blue" value="{{render2.data.lastname}} - {{render2.data.firstname}}">--</h3>
1717
<h3 data-value="{{ render2.data.lastname }}" value="{{lastname}}"></h3>
@@ -20,13 +20,13 @@ <h3 class="email" value="{{render2.data.email}}">--</h3>
2020
<textarea value="{{render2.data.lastname}}"></textarea>
2121
<h3 data-attribute="{{render2.data.personal_info.email}}" name="email" value="{{render2.data.personal_info.email}}"></h3>
2222

23-
<div class="template card" data-render_array="render2.data.testing_array">
23+
<div class="template card" render-array="render2.data.testing_array">
2424
<h3 data-attribute="{{render2.data.testing_array.email}}" name="email" class="{{render2.data.testing_array.email}}" value="">{{render2.data.testing_array.email}}</h3>
2525
<h3 value="">{{render2.collection}}</h3>
2626
<h3 value="{{render2.data.personal_info.email}}">{{render2.collection}}</h3>
2727
<div>*******************************************</div>
2828
</div>
29-
<div class="template card" data-render_array="render2.data.string_array" data-render_key="string">
29+
<div class="template card" render-array="render2.data.string_array" render-key="string">
3030

3131
<h3 name="test"
3232
data-attribute="{{string_.--}}"
@@ -43,9 +43,9 @@ <h3 value="{{render2.data.personal_info.email}}">{{render2.collection}}</h3>
4343
<pre>
4444
<h1>Paste in your browser console</h1>
4545

46-
/** Example of array object from db -- render2 is an example of data-render_id**/
46+
/** Example of array object from db -- render2 is an example of render_id**/
4747
CoCreate.render.data({
48-
selector: '[data-template_id=abc1]',
48+
selector: '[template_id=abc1]',
4949
data: {
5050
render2: {
5151
collection : 'dededede',

‎demo/fetch.string.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</style>
1111
<body>
1212

13-
<cocreate-select name="current_org" data-template_id="abc1">
14-
<selected class="template" data-template_id="abc1" data-render_array="data">
13+
<cocreate-select name="current_org" template_id="abc1">
14+
<selected class="template" template_id="abc1" render-array="data">
1515
<cc-option class="template" value="{{data.current_org}}">
1616
<h3>{{data.current_org}}</h3>
1717
</cc-option>
@@ -22,9 +22,9 @@ <h3>{{data.current_org}}</h3>
2222
<pre>
2323
<h1>Paste in your browser console</h1>
2424

25-
/** Example of array object from db -- render2 is an example of data-render_id**/
25+
/** Example of array object from db -- render2 is an example of render_id**/
2626
CoCreate.render.data({
27-
selector: '[data-template_id=abc1]',
27+
selector: '[template_id=abc1]',
2828
data: {
2929
collection : 'dededede',
3030
data: [{

‎demo/index.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</head>
88
<body>
99

10-
<div data-template_id="abc1" data-fetch_collection="render_test">
10+
<div template_id="abc1" fetch-collection="render_test">
1111
<div class="template card {{render2.collection}} card margin:10px firstname"
1212
data-value="{{render2.data._id}}"
13-
data-template_id="abc1"
14-
data-render_array="render2.data">
13+
template_id="abc1"
14+
render-array="render2.data">
1515
<div class="card-body padding:15px" collection="{{render2.collection}}">
1616
<h3 class="{{render2.data.firstname}} blue" value="{{render2.data.lastname}} - {{render2.data.firstname}}">--</h3>
1717
<h3 data-value="{{ render2.data.lastname }}" value="{{lastname}}"></h3>
@@ -20,15 +20,15 @@ <h3 class="email" value="{{render2.data.email}}">--</h3>
2020
<textarea value="{{render2.data.lastname}}"></textarea>
2121
<h3 data-attribute="{{render2.data.personal_info.email}}" name="email" value="{{render2.data.personal_info.email}}"></h3>
2222

23-
<div class="template card" data-render_array="render2.data.testing_array">
23+
<div class="template card" render-array="render2.data.testing_array">
2424
testing-array template
2525
<h3 data-attribute="{{render2.data.testing_array.email}}" name="email" class="{{render2.data.testing_array.email}}" value="{{render2.data.testing_array.email}}"></h3>
2626
<h3 value="{{render2.collection}}"></h3>
2727

2828
<h3 value="{{render2.data.personal_info.email}}"></h3>
2929
<div>*******************************************</div>
3030
</div>
31-
<div class="template card" data-render_array="render2.data.string_array" data-render_key="string">
31+
<div class="template card" render-array="render2.data.string_array" render-key="string">
3232
string - template
3333
<h3 name="test" data-attribute="{{string[]}}" class="{{string[]}}" value="{{string[]}}"></h3>
3434

@@ -42,9 +42,9 @@ <h3 name="test" data-attribute="{{string[]}}" class="{{string[]}}" value="{{stri
4242
<pre>
4343
<h1>Paste in your browser console</h1>
4444

45-
/** Example of array object from db -- render2 is an example of data-render_id**/
45+
/** Example of array object from db -- render2 is an example of render_id**/
4646
CoCreate.render.data({
47-
selector: '[data-template_id=abc1]',
47+
selector: '[template_id=abc1]',
4848
data: {
4949
render2: {
5050
collection : 'dededede',

‎demo/render.array.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</style>
1111
<body>
1212

13-
<cocreate-select name="current_org" data-template_id="abc1">
14-
<selected class="template" data-template_id="abc1" data-render_array="data">
15-
<cc-option class="template" data-render_array="data.current_org" data-render_key="current_org" value="{{current_org[]}}">
13+
<cocreate-select name="current_org" template_id="abc1">
14+
<selected class="template" template_id="abc1" render-array="data">
15+
<cc-option class="template" render-array="data.current_org" render-key="current_org" value="{{current_org[]}}">
1616
<h3>{{current_org[]}}</h3>
1717
</cc-option>
1818
</selected>
@@ -24,7 +24,7 @@ <h1>Paste in your browser console</h1>
2424

2525
/** Example **/
2626
CoCreate.render.data({
27-
selector: '[data-template_id=abc1]',
27+
selector: '[template_id=abc1]',
2828
data: {
2929
collection : 'dededede',
3030
data: [{

‎demo/suggestion.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
</head>
88
<body>
99

10-
<div data-template_id="abc1" data-fetch_collection="render_test">
10+
<div template_id="abc1" fetch-collection="render_test">
1111
<div class="template card {{render2.collection}} card margin:10px firstname"
1212
data-value="{{render2.data._id}}"
13-
data-template_id="abc1"
14-
data-render_array="render2.data">
13+
template_id="abc1"
14+
render-array="render2.data">
1515
<div class="card-body padding:15px" collection="{{render2.collection}}">
16-
<div class="template card" data-render_array="render2.data.string_array" data-render_key="lol">
16+
<div class="template card" render-array="render2.data.string_array" render-key="lol">
1717
<h3 name="test" data-attribute="{{lol[]}}" class="{{lol[]}}" value="{{lol[]}}"></h3>
1818
</div>
1919

@@ -25,9 +25,9 @@ <h3 name="test" data-attribute="{{lol[]}}" class="{{lol[]}}" value="{{lol[]}}"><
2525
<pre>
2626
<h1>Paste in your browser console</h1>
2727

28-
/** Example of array object from db -- render2 is an example of data-render_id**/
28+
/** Example of array object from db -- render2 is an example of render_id**/
2929
CoCreate.render.data({
30-
selector: '[data-template_id=abc1]',
30+
selector: '[template_id=abc1]',
3131
data: {
3232
render2: {
3333
collection : 'dededede',

‎docs/index.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ <h4 class="margin-top:20px padding:5px_0px">HTML Template</h4>
7676

7777
<div class="margin-top:10px">
7878
<pre><code class="language-html">
79-
&lt;div data-template_id=&quot;abc1&quot; data-fetch_collection=&quot;render_test&quot;&gt;
79+
&lt;div template_id=&quot;abc1&quot; fetch-collection=&quot;render_test&quot;&gt;
8080
&lt;div class=&quot;template card {{render2.collection}} card margin:10px firstname&quot;
8181
data-value=&quot;{{render2.data._id}}&quot;
82-
data-template_id=&quot;abc1&quot;
83-
data-render_array=&quot;render2.data&quot;&gt;
82+
template_id=&quot;abc1&quot;
83+
render-array=&quot;render2.data&quot;&gt;
8484
&lt;div class=&quot;card-body padding:15px&quot; collection=&quot;{{render2.collection}}&quot;&gt;
8585
&lt;h3 class=&quot;{{render2.data.firstname}} blue&quot; value=&quot;{{render2.data.lastname}} - {{render2.data.firstname}}&quot;&gt;--&lt;/h3&gt;
8686
&lt;h3 data-value=&quot;{{ render2.data.lastname }}&quot; value=&quot;{{lastname}}&quot;&gt;&lt;/h3&gt;
@@ -90,15 +90,15 @@ <h4 class="margin-top:20px padding:5px_0px">HTML Template</h4>
9090
&lt;h3 data-attribute=&quot;{{render2.data.personal_info.email}}&quot; name=&quot;email&quot; value=&quot;{{render2.data.personal_info.email}}&quot;&gt;&lt;/h3&gt;
9191

9292
&lt;div class=&quot;template card &quot;
93-
data-render_array=&quot;render2.data.testing_array&quot;&gt;
93+
render-array=&quot;render2.data.testing_array&quot;&gt;
9494

9595
&lt;h3 data-attribute=&quot;{{render2.data.testing_array.email}}&quot; name=&quot;email&quot; class=&quot;{{render2.data.testing_array.email}}&quot; value=&quot;{{render2.data.testing_array.email}}&quot;&gt;&lt;/h3&gt;
9696
&lt;h3 value=&quot;{{render2.collection}}&quot;&gt;&lt;/h3&gt;
9797

9898
&lt;h3 value=&quot;{{render2.data.personal_info.email}}&quot;&gt;&lt;/h3&gt;
9999
&lt;/div&gt;
100100
&lt;div class=&quot;template card &quot;
101-
data-render_array=&quot;render2.data.string_array&quot; data-render_key=&quot;string_&quot;&gt;
101+
render-array=&quot;render2.data.string_array&quot; render-key=&quot;string_&quot;&gt;
102102

103103
&lt;h3 name=&quot;test&quot;
104104
data-attribute=&quot;{{string_.--}}&quot;
@@ -115,7 +115,7 @@ <h4 class="margin-top:40px padding:5px_0px">CoCreate-render usage</h4>
115115
<p class="padding:10px_0px line-height:1.5">Description.</p>
116116
<pre><code class="language-html">
117117
CoCreate.render.data({
118-
selector: '[data-template_id=abc1]',
118+
selector: '[template_id=abc1]',
119119
data: {
120120
render2: {
121121
collection : 'dededede',
@@ -156,13 +156,13 @@ <h2 class="padding:5px_0px">Attributes</h2>
156156
</div>
157157
<ul class="list-style-type:none ">
158158
<li class="padding:15px_0px border-bottom:1px_solid_lightgrey">
159-
<h4><span>data-render_array</span> <span class="cocreate-badge warning">optional</span><span class="cocreate-badge danger">required</span></h4>
159+
<h4><span>render-array</span> <span class="cocreate-badge warning">optional</span><span class="cocreate-badge danger">required</span></h4>
160160
<p>To render the array data, this attribute should define by the object selector path</p>
161161
</li>
162162
<li class="padding:15px_0px border-bottom:1px_solid_lightgrey">
163-
<h4><span>data-render_key</span> <span class="cocreate-badge warning">optional</span><span class="cocreate-badge">Default: data-render_array's value</span></h4>
164-
<p>If data-render_array defined, this attribute can define</p>
165-
<p>Default value is value of data-render_array</p>
163+
<h4><span>render-key</span> <span class="cocreate-badge warning">optional</span><span class="cocreate-badge">Default: render-array's value</span></h4>
164+
<p>If render-array defined, this attribute can define</p>
165+
<p>Default value is value of render-array</p>
166166
</li>
167167
</ul>
168168

@@ -216,7 +216,7 @@ <h4>
216216
<h2 class="border-bottom:1px_solid_lightgrey margin-top:20px padding:5px_0px">How Does It Works</h2>
217217
<p>CoCreate-render works based on attributes and template, The attributes to render should be wrapper "{{ }}", and attributes can include the combine "{{}}" wrapper.</p>
218218

219-
<p>To render the array data, Render need to define <code class="language-js">class="template"</code>. <code class="language-js">data-render_array</code></p>
219+
<p>To render the array data, Render need to define <code class="language-js">class="template"</code>. <code class="language-js">render-array</code></p>
220220

221221
<h2 class="border-bottom:1px_solid_lightgrey margin-top:20px padding:5px_0px">Effects and Styles</h2>
222222

@@ -234,8 +234,8 @@ <h2 class="padding:5px_0px">Demo</h2>
234234
<div class="position:sticky top:0 padding:15px_0px height:100vh">
235235
<div class="container svColumn overflow:hidden card border-radius:2px width:auto height:100%" id="sandbox">
236236
<div class="font-size:20px position:absolute top:10px right:10px opacity:0.6 z-index:7"> <a class="margin-right:10px" id="preview" data-show="preview" data-hide="code"><i class="far fa-eye"></i></a> <a class="margin-right:10px hidden" id="code" data-show="code" data-hide="preview"><i class="fas fa-code"></i></a>
237-
<!--<a class="margin-right:10px"><i class="far fa-window-maximize"></i></a>--><a target="modal" href="module_activity_datatable.html" data-pass_collection="modules" data-pass_document_id="" data-pass_fetch_value="" data-pass_prefix="" data-pass_to="render" data-modal_width="600px" data-modal_height="400px" data-modal_color="#229954"
238-
data-modal_header="false" class="margin-right:10px">
237+
<!--<a class="margin-right:10px"><i class="far fa-window-maximize"></i></a>--><a target="modal" href="module_activity_datatable.html" pass-collection="modules" pass-document_id="" pass-fetch_value="" pass-prefix="" pass_to="render" modal-width="600px" modal-height="400px" modal-color="#229954"
238+
modal-header="false" class="margin-right:10px">
239239
<i class="fas fa-external-link-alt"></i>
240240
</a> <a class="margin-right:5px" data-fullscreen target="#sandbox"><i class="fas fa-expand"></i></a> </div>
241241
<div class="svRow">

‎src/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ const CoCreateRender = {
7272
},
7373

7474
setArray: function(template, data) {
75-
const type = template.getAttribute('data-render_array') || "data";
76-
const render_key = template.getAttribute('data-render_key') || type;
75+
const type = template.getAttribute('render-array') || "data";
76+
const render_key = template.getAttribute('render-key') || type;
7777
const self = this;
7878
const arrayData = this.__getValueFromObject(data, type);
7979

@@ -102,7 +102,7 @@ const CoCreateRender = {
102102
if (!data) return;
103103
const that = this;
104104
Array.from(els).forEach(e => {
105-
let passId = e.getAttribute('data-pass_id');
105+
let passId = e.getAttribute('pass_id');
106106
if (passTo && passId != passTo) {
107107
return;
108108
}
@@ -167,7 +167,7 @@ const CoCreateRender = {
167167
return;
168168
}
169169
if (Array.isArray(dataResult)) {
170-
template_div.setAttribute('data-render_array', 'test');
170+
template_div.setAttribute('render-array', 'test');
171171
this.setValue([template_div], {test: dataResult});
172172
} else {
173173
this.setValue(template_div.children, dataResult);

0 commit comments

Comments
 (0)