Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

4ed28697 · Julia Radzhabova · e4bbebc2 · 6bc31d03 · 4ed28697
Commit 4ed28697 authored Apr 15, 2016 by Julia Radzhabova
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js +1 -1

No files found.
--- a/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
@@ -1124,7 +1124,7 @@ define([
                border.put_Color(color);
            }
            else {
-                border.put_Color(new CColor());
+                border.put_Color(new Asc.asc_CColor());
                border.put_Value(0);
            }
            return border;