update CHANGES

tategakibunko · May 19, 2016 · 935927e · 935927e
1 parent b73dc79
commit 935927e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -6,6 6,10 @@ Mark "*": bug fixed.
 Mark "!": change that can break compatibility with older version
 ===============================================================================
 
 version 5.5.2 2016/5/20
 ========================
 * Fix invalid updation(Document.setStyle).
 
 version 5.5.1 2016/4/24
 ========================
 o Add Nehan.Config.mathjax for configuration of MathJax typesetting.

diff --git a/dist/nehan.js b/dist/nehan.js
@@ -32,7 32,7 @@
  @namespace Nehan
  */
 var Nehan = Nehan || {};
-Nehan.version = "5.5.1";
 Nehan.version = "5.5.2";
 
 /**
  system configuration
@@ -20562,7 20562,11 @@ Nehan.Document = (function(){
  * doc.setStyle("body", {fontSize:"16px"});
  */
  Document.prototype.setStyle = function(key, value){
- this.styles[key] = value;
  var target = this.styles[key] || {};
  for(var prop in value){
  target[prop] = value[prop];
  }
  this.styles[key] = target;
  return this;
  };
 

diff --git a/dist/nehan.min.js b/dist/nehan.min.js
diff --git a/src/document.js b/src/document.js
@@ -97,7 97,11 @@ Nehan.Document = (function(){
  * doc.setStyle("body", {fontSize:"16px"});
  */
  Document.prototype.setStyle = function(key, value){
- this.styles[key] = value;
  var target = this.styles[key] || {};
  for(var prop in value){
  target[prop] = value[prop];
  }
  this.styles[key] = target;
  return this;
  };
 

diff --git a/src/nehan-start.js b/src/nehan-start.js
@@ -2,4 2,4 @@
  @namespace Nehan
  */
 var Nehan = Nehan || {};
-Nehan.version = "5.5.1";
 Nehan.version = "5.5.2";