json-object-editor 0.10.210 → 0.10.220

package/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## CHANGELOG
 
 ### 0.10.200
+	220 - updated user, added ability for manifest.js
+		- updated AWS uploaders
 	210 - touchpoint updated
 	201 - fixed window.set
 	200 

package/js/joe.js

@@ -9382,7 +9382,7 @@ logit(intent)
                             logit(response);
                             var bucket = response.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
                             var region = (_joe.Utils.Settings('AWS_S3CONFIG') ||{}).region;
-                            var prefix = 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
+                            var prefix = (_joe.Data.setting.where({name:'AWS_S3PREFIX'})[0] || {value:''}).value || 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
                             var url = prefix+response.Key;
                             var filename = response.Key.replace(self.current.object._id+'/','');
                             //TODO: change file status in list.
@@ -9421,7 +9421,9 @@ logit(intent)
                             logit(data);
                             var bucket = data.bucket || (_joe.Data.setting.where({name:'AWS_BUCKETNAME'})[0] || {value:''}).value;
                             
-                            var prefix = 'https://s3.amazonaws.com/'+bucket+'/';
+                            //var prefix = 'https://s3.amazonaws.com/'+bucket+'/';
+                            var prefix = (_joe.Data.setting.where({name:'AWS_S3PREFIX'})[0] || {value:''}).value || 'https://s3.'+((region && region +'.')||'')+'amazonaws.com/'+bucket+'/';
+
                             var url = prefix+data.Key;
                             if(field.url_field){
                                 var nprop = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.10.210",
+  "version": "0.10.220",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {

package/pages/joe.html

@@ -8,7 +8,7 @@
 	<link rel="icon" href="/JsonObjectEditor/favicon.ico" type="image/x-icon">
 	<link rel="icon" sizes="192x192" href="/JsonObjectEditor/img/ico/android-icon-192x192.png">
 	<link rel="apple-touch-icon" sizes="144x144" href="/JsonObjectEditor/img/ico/android-icon-144x144.png" />
-
+	<meta name="joe-notes" content="joe.html template" >
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="mobile-web-app-capable" content="yes">
 

package/pages/template.html

@@ -11,13 +11,14 @@
 	<link rel="icon" sizes="192x192" href="/JsonObjectEditor/img/ico/android-icon-192x192.png">
 	<link rel="apple-touch-icon" sizes="144x144" href="/JsonObjectEditor/img/ico/android-icon-144x144.png" />
 
+	<meta name="joe-notes" content="template.html template" >
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="mobile-web-app-capable" content="yes">
 
 	<link rel="stylesheet" href="${JOEPATH}js/plugins/c3/c3.min.css"/>
 	<link rel="stylesheet" href="${JOEPATH}capp/capp.css"/>
 	<link href="/JsonObjectEditor/css/joe.css" rel="stylesheet" type="text/css"/>
-	
+	${this.settings.joe_icons}
 	<!--<script src="${JOEPATH}_joeinclude.js"></script>-->
 	
 	<script type="text/javascript" src="/JsonObjectEditor/js/libs/jquery-1.11.3.min.js"></script>

package/server/schemas/user.js

@@ -24,7 +24,12 @@ var user = function(){return{
         }*/
 
     },
-    itemExpander:'email<br/>${email}<br/>bio<br/>${description}',
+    itemExpander:function(u){
+        return `<joe-subtext>email</joe-subtext>
+        ${u.email}
+        <br/>
+        ${u.description}`;
+    },
     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>',
     stripeColor:function(item){
         return item.color;