Merge pull request #83 from times/feature/build2.0.6

Build and tweak version number in README
chrishutchinson · Jul 19, 2017 · 1aa4eee · 1aa4eee
2 parents 96b15a1 + 1faed4c
commit 1aa4eee
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -74,8 +74,8 @@ renderer.renderUI('card');
 <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.2/react-dom.min.js"></script>
 
 <!-- Load in the CardKit and CardKitDOM Libraries -->
-<script type="text/javascript" src="https://cdn.rawgit.com/times/cardkit/v2.0.4/dist/cardkit.js"></script>
-<script type="text/javascript" src="https://cdn.rawgit.com/times/cardkit/v2.0.4/dist/dom.js"></script>
+<script type="text/javascript" src="https://cdn.rawgit.com/times/cardkit/v2.0.6/dist/cardkit.js"></script>
+<script type="text/javascript" src="https://cdn.rawgit.com/times/cardkit/v2.0.6/dist/dom.js"></script>
 
 <!-- Your container element to render into -->
 <div id="card"></div>

diff --git a/dist/dom.js b/dist/dom.js
diff --git a/dom.js b/dom.js
@@ -463,6 +463,7 @@ return /******/ (function(modules) { // webpackBootstrap
  y: _this3.calculateYPosition(layers, layerData),
  fontFamily: layerData.fontFamily,
  fontSize: layerData.fontSize,
+ fontWeight: layerData.fontWeight,
  lineHeight: layerData.lineHeight,
  textAnchor: layerData.textAnchor,
  fill: layerData.fill,
@@ -548,19 +549,20 @@ return /******/ (function(modules) { // webpackBootstrap
  value: function computeFonts() {
  var fonts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
 
- var array = [];
- var font = void 0;
+ return Object.keys(fonts).map(function (key, index) {
+ var src = fonts[key];
+ var format = 'svg';
+ if (_typeof(fonts[key]) === 'object') {
+ src = fonts[key].src;
+ format = fonts[key].format || 'svg';
+ }
 
- Object.keys(fonts).forEach(function (key, index) {
- font = fonts[key];
- array.push(React.createElement(
+ return React.createElement(
  'style',
  { key: index },
- '@font-face {\n font-family: "' + key + '";\n src: url(' + font + ') format("woff");\n font-weight: normal;\n font-style: normal;\n }'
- ));
+ '@font-face {\n font-family: \'' + key + '\';\n src: url("' + src + '") format("' + format + '");\n font-weight: normal;\n font-style: normal;\n }'
+ );
  });
-
- return array;
  }
 
  /**

diff --git a/server.js b/server.js
@@ -19653,6 +19653,7 @@ return /******/ (function(modules) { // webpackBootstrap
  y: _this3.calculateYPosition(layers, layerData),
  fontFamily: layerData.fontFamily,
  fontSize: layerData.fontSize,
+ fontWeight: layerData.fontWeight,
  lineHeight: layerData.lineHeight,
  textAnchor: layerData.textAnchor,
  fill: layerData.fill,
@@ -19738,19 +19739,20 @@ return /******/ (function(modules) { // webpackBootstrap
  value: function computeFonts() {
  var fonts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
 
- var array = [];
- var font = void 0;
+ return Object.keys(fonts).map(function (key, index) {
+ var src = fonts[key];
+ var format = 'svg';
+ if (_typeof(fonts[key]) === 'object') {
+ src = fonts[key].src;
+ format = fonts[key].format || 'svg';
+ }
 
- Object.keys(fonts).forEach(function (key, index) {
- font = fonts[key];
- array.push(React.createElement(
+ return React.createElement(
  'style',
  { key: index },
- '@font-face {\n font-family: "' + key + '";\n src: url(' + font + ') format("woff");\n font-weight: normal;\n font-style: normal;\n }'
- ));
+ '@font-face {\n font-family: \'' + key + '\';\n src: url("' + src + '") format("' + format + '");\n font-weight: normal;\n font-style: normal;\n }'
+ );
  });
-
- return array;
  }
 
  /**