@nakedcreativity/cee-ms-node 0.3.17 → 0.3.18

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 (2) hide show
  1. package/index.js +13 -38
  2. package/package.json +1 -1
package/index.js CHANGED
@@ -6,6 +6,7 @@ var Liquid = require('nakedcreativity-liquid');
6
6
  var cheerio = require('cheerio');
7
7
  var bodyParser = require("body-parser");
8
8
 
9
+ var lexical = Liquid.lexical;
9
10
 
10
11
  var site;
11
12
  var engine;
@@ -61,59 +62,33 @@ function ceems(config) {
61
62
  }
62
63
  });
63
64
 
64
- this.engine.registerTag('image', {
65
- parse: function(tagToken, remainTokens) {
66
- this.args = tagToken.args.split(' ');
67
- },
68
- render: function(scope, hash) {
69
- var image = Liquid.evalExp(this.args[0], scope);
70
- console.log(image)
71
- if(this.args[1] && image.variants && image.variants[this.args[1]]){
72
- var src = image.variants[this.args[1]]
73
- }else {
74
- var src = image.src
75
- }
76
- var alt = image.alt || ''
77
- return Promise.resolve('<img src="'+src+'" alt="'+alt+'"/>');
78
- }
79
- });
80
-
81
- this.engine.registerTag('imageurl', {
82
- parse: function(tagToken, remainTokens) {
83
- this.args = tagToken.args.split(' ');
84
- },
85
- render: function(scope, hash) {
86
- var image = Liquid.evalExp(this.args[0], scope);
87
- console.log(image)
88
- if(this.args[1] && image.variants && image.variants[this.args[1]]){
89
- var src = image.variants[this.args[1]]
90
- }else {
91
- var src = image.src
92
- }
93
- return Promise.resolve(src);
94
- }
95
- });
96
-
97
-
98
65
  this.engine.registerTag('navigation', {
99
66
  parse: function(tagToken, remainTokens) {
100
67
  this.match = tagToken.args.split(' '); // name // path[0] == navigation name
101
68
  },
102
69
  render: function(scope, hash){
103
- //var filepath = Liquid.evalValue(this.match[1]+'.liquid', scope);
70
+
71
+ var value = Liquid.evalValue(this.match[0], scope)
72
+ if(!value){
73
+ value = Liquid.lexical.parseLiteral(this.match[0])
74
+ }
104
75
  var page = scope.scopes[0]
105
76
 
106
77
  if(page.path && this.match[0] == 'page.path[0]' && site.navigation[page.path[0]]){
107
78
  scope.push(site.navigation[page.path[0]]);
108
79
  }else if(page.path && this.match[0] == 'page.path[1]' && site.navigation[page.path[1]]){
109
80
  scope.push(site.navigation[page.path[1]]);
110
- }else if(site.navigation[this.match[0]]){
111
- scope.push(site.navigation[this.match[0]]);
81
+ }else if(site.navigation[value]){
82
+ scope.push(site.navigation[value]);
112
83
  }else {
113
84
  return
114
85
  }
86
+ var template = Liquid.lexical.parseLiteral(this.match[1])
87
+ if(!template){
88
+ template = this.match[1]
89
+ }
115
90
 
116
- return engine.handleCache(this.match[1]+'.liquid')
91
+ return engine.handleCache(template+'.liquid')
117
92
  .then((templates) => {
118
93
  return engine.renderer.renderTemplates(templates, scope);
119
94
  })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nakedcreativity/cee-ms-node",
3
- "version": "0.3.17",
3
+ "version": "0.3.18",
4
4
  "description": "Cee.ms for Node.js",
5
5
  "main": "index.js",
6
6
  "scripts": {