diff --git a/src/load.js b/src/load.js index 541931ae..c9173e6d 100644 --- a/src/load.js +++ b/src/load.js @@ -44,8 +44,6 @@ var sources = [ 'src/item/Layer.js', 'src/item/Raster.js', 'src/item/PlacedSymbol.js', - 'src/item/Style.js', - 'src/item/PathStyle.js', 'src/path/Segment.js', 'src/path/SegmentPoint.js', @@ -61,8 +59,11 @@ var sources = [ 'src/text/TextItem.js', 'src/text/PointText.js', - 'src/text/ParagraphStyle.js', - 'src/text/CharacterStyle.js', + + 'src/style/Style.js', + 'src/style/PathStyle.js', + 'src/style/ParagraphStyle.js', + 'src/style/CharacterStyle.js', 'src/color/Color.js', 'src/color/GradientColor.js', diff --git a/src/paper.js b/src/paper.js index 9d91f58c..45230142 100644 --- a/src/paper.js +++ b/src/paper.js @@ -64,8 +64,6 @@ var paper = new function() { //#include "item/Layer.js" //#include "item/Raster.js" //#include "item/PlacedSymbol.js" -//#include "item/Style.js" -//#include "item/PathStyle.js" //#include "path/Segment.js" //#include "path/SegmentPoint.js" @@ -81,8 +79,11 @@ var paper = new function() { //#include "text/TextItem.js" //#include "text/PointText.js" -//#include "text/ParagraphStyle.js" -//#include "text/CharacterStyle.js" + +//#include "style/Style.js" +//#include "style/PathStyle.js" +//#include "style/ParagraphStyle.js" +//#include "style/CharacterStyle.js" //#include "color/Color.js" //#include "color/GradientColor.js" diff --git a/src/text/CharacterStyle.js b/src/style/CharacterStyle.js similarity index 100% rename from src/text/CharacterStyle.js rename to src/style/CharacterStyle.js diff --git a/src/text/ParagraphStyle.js b/src/style/ParagraphStyle.js similarity index 100% rename from src/text/ParagraphStyle.js rename to src/style/ParagraphStyle.js diff --git a/src/item/PathStyle.js b/src/style/PathStyle.js similarity index 100% rename from src/item/PathStyle.js rename to src/style/PathStyle.js diff --git a/src/item/Style.js b/src/style/Style.js similarity index 100% rename from src/item/Style.js rename to src/style/Style.js