Merge branch 'master' into feature/fix-commonjs

# Conflicts: # package.json
smartrecruiters · Mar 27, 2016 · ecaae27 · ecaae27
2 parents a15a7fb + c2edba3
commit ecaae27
Show file tree

Hide file tree

Showing 13 changed files with 107 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-textAngular v1.4.6
+textAngular v1.5.0
 ===========
 
 [![Build Status](https://travis-ci.org/fraywing/textAngular.png?branch=master)](https://travis-ci.org/fraywing/textAngular) [![Coverage Status](https://coveralls.io/repos/fraywing/textAngular/badge.png)](https://coveralls.io/r/fraywing/textAngular)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "textAngular",
-  "version": "1.4.6",
+  "version": "1.5.0",
   "main": [
     "./dist/textAngular.js",
     "./dist/textAngular-sanitize.js",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,17 @@
+<a name"1.5.0"></a>
+## 1.5.0 (2016-01-16)
+
+
+#### Bug Fixes
+
+* **main.js:**
+  * we now hide the popover at the end of the image resize. ([c182c96c](https://github.com/fraywing/textAngular/commit/c182c96c))
+  * we now hide the popover at the end of the image resize. ([d9cfcf15](https://github.com/fraywing/textAngular/commit/d9cfcf15))
+  * Fix for #862 where the model was not changing after image resize. ([d5a508e3](https://github.com/fraywing/textAngular/commit/d5a508e3))
+* **taBind.js:** Fix bug #843 -- improper closing of list elements ([a0b79276](https://github.com/fraywing/textAngular/commit/a0b79276))
+* **textAngular-santitize:** Fix for internal model ignores style attr #854 ([9fc7288b](https://github.com/fraywing/textAngular/commit/9fc7288b))
+
+
 <a name"1.4.6"></a>
 ### 1.4.6 (2015-09-20)
 

diff --git a/demo/demo.html b/demo/demo.html
@@ -23,7 +23,8 @@
 
       <script src='../dist/textAngular-sanitize.min.js'></script>
 
-      <script src='../dist/textAngular.min.js'></script>
+      <script src='../dist/textAngularSetup.js'></script>
+      <script src='../dist/textAngular.js'></script>
 
 </head>
 

diff --git a/dist/textAngular-rangy.min.js b/dist/textAngular-rangy.min.js
diff --git a/dist/textAngular-sanitize.js b/dist/textAngular-sanitize.js
@@ -535,6 +535,14 @@ function validStyles(styleAttr){
 					|| value === 'justify'
 				)
 			||
+                key === 'text-decoration' && (
+                    value === 'underline'
+                    || value === 'line-through'
+                )
+            || key === 'font-weight' && (
+                    value === 'bold'
+                )
+            ||
 				key === 'float' && (
 					value === 'left'
 					|| value === 'right'

diff --git a/dist/textAngular-sanitize.min.js b/dist/textAngular-sanitize.min.js