json-object-editor 0.10.201 → 0.10.220

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.
Files changed (8) hide show
  1. package/CHANGELOG.md +4 -1
  2. package/img/svgs/touchpoint.svg +1 -0
  3. package/js/joe.js +4 -2
  4. package/package.json +1 -1
  5. package/pages/joe.html +1 -1
  6. package/pages/template.html +2 -1
  7. package/server/schemas/touchpoint.js +1 -0
  8. package/server/schemas/user.js +6 -1
package/CHANGELOG.md CHANGED
@@ -1,6 +1,9 @@
1
1
  ## CHANGELOG
2
2
 
3
- ### 0.10.201
3
+ ### 0.10.200
4
+ 220 - updated user, added ability for manifest.js
5
+ - updated AWS uploaders
6
+ 210 - touchpoint updated
4
7
  201 - fixed window.set
5
8
  200
6
9
  - MemberRegistry takes makeSet:bool||STR and shows count (reqs fields)
package/img/svgs/touchpoint.svg ADDED
@@ -0,0 +1 @@
1
+ <svg width="1600" height="1600" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg"><path d="M702 994 417 788s-30-20-18-35c1-3 7-10 22-14 31-8 73 16 101 33 28 16 62 31 62 31L441 443l-1-1s-2-6 1-12c3-7 13-14 27-20 13-5 25-6 31-3 5 2 7 6 7 7v1l99 248 43-16-40-100 54-21c4 0 20 0 31 26l27 68 43-16-23-57 49-18 1-1-1 1c5-1 14 4 23 25l27 68 43-16-25-62 44-16h7c6 3 12 10 17 22 0 0 52 136 62 203 10 75 6 171 3 220a543 543 0 0 0 46-55A540 540 0 0 0 514 67a320 320 0 0 1 125 420l-47 18-42-104-3-8a202 202 0 0 0-196-252 202 202 0 1 0 75 390l42 106 2 4A320 320 0 0 1 70 496a541 541 0 0 0 681 622zM399 413c-7 15-6 29-4 38-14 5-28 8-44 8a116 116 0 1 1 114-94l-14 4c-26 10-44 24-52 44z"/></svg>
package/js/joe.js CHANGED
@@ -9382,7 +9382,7 @@ logit(intent)
9382
9382
  logit(response);
9383
9383
  var bucket = response.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
9384
9384
  var region = (_joe.Utils.Settings('AWS_S3CONFIG') ||{}).region;
9385
- var prefix = 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
9385
+ var prefix = (_joe.Data.setting.where({name:'AWS_S3PREFIX'})[0] || {value:''}).value || 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
9386
9386
  var url = prefix+response.Key;
9387
9387
  var filename = response.Key.replace(self.current.object._id+'/','');
9388
9388
  //TODO: change file status in list.
@@ -9421,7 +9421,9 @@ logit(intent)
9421
9421
  logit(data);
9422
9422
  var bucket = data.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
9423
9423
 
9424
- var prefix = 'https://s3.amazonaws.com/'+bucket+'/';
9424
+ //var prefix = 'https://s3.amazonaws.com/'+bucket+'/';
9425
+ var prefix = (_joe.Data.setting.where({name:'AWS_S3PREFIX'})[0] || {value:''}).value || 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
9426
+
9425
9427
  var url = prefix+data.Key;
9426
9428
  if(field.url_field){
9427
9429
  var nprop = {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "json-object-editor",
3
- "version": "0.10.201",
3
+ "version": "0.10.220",
4
4
  "description": "JOE the Json Object Editor | Platform Edition",
5
5
  "main": "app.js",
6
6
  "scripts": {
package/pages/joe.html CHANGED
@@ -8,7 +8,7 @@
8
8
  <link rel="icon" href="/JsonObjectEditor/favicon.ico" type="image/x-icon">
9
9
  <link rel="icon" sizes="192x192" href="/JsonObjectEditor/img/ico/android-icon-192x192.png">
10
10
  <link rel="apple-touch-icon" sizes="144x144" href="/JsonObjectEditor/img/ico/android-icon-144x144.png" />
11
-
11
+ <meta name="joe-notes" content="joe.html template" >
12
12
  <meta name="apple-mobile-web-app-capable" content="yes">
13
13
  <meta name="mobile-web-app-capable" content="yes">
14
14
 
package/pages/template.html CHANGED
@@ -11,13 +11,14 @@
11
11
  <link rel="icon" sizes="192x192" href="/JsonObjectEditor/img/ico/android-icon-192x192.png">
12
12
  <link rel="apple-touch-icon" sizes="144x144" href="/JsonObjectEditor/img/ico/android-icon-144x144.png" />
13
13
 
14
+ <meta name="joe-notes" content="template.html template" >
14
15
  <meta name="apple-mobile-web-app-capable" content="yes">
15
16
  <meta name="mobile-web-app-capable" content="yes">
16
17
 
17
18
  <link rel="stylesheet" href="${JOEPATH}js/plugins/c3/c3.min.css"/>
18
19
  <link rel="stylesheet" href="${JOEPATH}capp/capp.css"/>
19
20
  <link href="/JsonObjectEditor/css/joe.css" rel="stylesheet" type="text/css"/>
20
-
21
+ ${this.settings.joe_icons}
21
22
  <!--<script src="${JOEPATH}_joeinclude.js"></script>-->
22
23
 
23
24
  <script type="text/javascript" src="/JsonObjectEditor/js/libs/jquery-1.11.3.min.js"></script>
package/server/schemas/touchpoint.js CHANGED
@@ -1,6 +1,7 @@
1
1
  var schema = {
2
2
  title : 'Touchpoint | ${name}',
3
3
  info:"Here is a catalogue of every touchpoint you've ever made with each of your visitors.",
4
+ menuicon:'<svg viewBox="-250 -250 1800 1800" xmlns="http://www.w3.org/2000/svg"><path d="M702 994 417 788s-30-20-18-35c1-3 7-10 22-14 31-8 73 16 101 33 28 16 62 31 62 31L441 443l-1-1s-2-6 1-12c3-7 13-14 27-20 13-5 25-6 31-3 5 2 7 6 7 7v1l99 248 43-16-40-100 54-21c4 0 20 0 31 26l27 68 43-16-23-57 49-18 1-1-1 1c5-1 14 4 23 25l27 68 43-16-25-62 44-16h7c6 3 12 10 17 22 0 0 52 136 62 203 10 75 6 171 3 220a543 543 0 0 0 46-55A540 540 0 0 0 514 67a320 320 0 0 1 125 420l-47 18-42-104-3-8a202 202 0 0 0-196-252 202 202 0 1 0 75 390l42 106 2 4A320 320 0 0 1 70 496a541 541 0 0 0 681 622zM399 413c-7 15-6 29-4 38-14 5-28 8-44 8a116 116 0 1 1 114-94l-14 4c-26 10-44 24-52 44z"/></svg>',
4
5
  listView:{
5
6
  title: '<joe-title>${info}</joe-title><joe-subtitle>${session}</joe-subtitle><joe-subtitle>${visitor}</joe-subtitle>',
6
7
  listWindowTitle: 'Touchpoints'
package/server/schemas/user.js CHANGED
@@ -24,7 +24,12 @@ var user = function(){return{
24
24
  }*/
25
25
 
26
26
  },
27
- itemExpander:'email<br/>${email}<br/>bio<br/>${description}',
27
+ itemExpander:function(u){
28
+ return `<joe-subtext>email</joe-subtext>
29
+ ${u.email}
30
+ <br/>
31
+ ${u.description}`;
32
+ },
28
33
  menuicon:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-20 -20 140 140"><g><path d="M74 79.4c-4-6.8-13.3-14.9-24-14.9S30 72.6 26 79.4a44.1 44.1 0 0 0 24 6.7A44.1 44.1 0 0 0 74 79.4Z"/><circle cx="50" cy="39.3" r="18.8"/><path d="M50 14.9A35.1 35.1 0 1 1 14.9 50 35.1 35.1 0 0 1 50 14.9m0-1A36.1 36.1 0 1 0 86.1 50 36.1 36.1 0 0 0 50 13.9Z"/><path d="M90 50A40 40 0 1 1 50 10 40 40 0 0 1 90 50ZM50 13.9A36.1 36.1 0 1 0 86.1 50 36.1 36.1 0 0 0 50 13.9Z"/></g></svg>',
29
34
  stripeColor:function(item){
30
35
  return item.color;