diff options
Diffstat (limited to 'js')
-rwxr-xr-x | js/controllers/styles-controller.js | 2 | ||||
-rw-r--r-- | js/panels/css-panel/style-sheet.reel/style-sheet.html | 14 | ||||
-rw-r--r-- | js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | 10 |
3 files changed, 7 insertions, 19 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js index 3422427c..dfe7c69a 100755 --- a/js/controllers/styles-controller.js +++ b/js/controllers/styles-controller.js | |||
@@ -1252,6 +1252,8 @@ var stylesController = exports.StylesController = Montage.create(Component, { | |||
1252 | doc.head.appendChild(sheetElement); | 1252 | doc.head.appendChild(sheetElement); |
1253 | sheet = this.getSheetFromElement(sheetElement, doc); | 1253 | sheet = this.getSheetFromElement(sheetElement, doc); |
1254 | 1254 | ||
1255 | this.userStyleSheets.push(sheet); | ||
1256 | |||
1255 | this.styleSheetModified(sheet); | 1257 | this.styleSheetModified(sheet); |
1256 | 1258 | ||
1257 | NJevent('newStyleSheet', sheet); | 1259 | NJevent('newStyleSheet', sheet); |
diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html index 1820f780..6a9dee65 100644 --- a/js/panels/css-panel/style-sheet.reel/style-sheet.html +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html | |||
@@ -24,14 +24,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
24 | "deleteButton": {"@": "deleteButton"} | 24 | "deleteButton": {"@": "deleteButton"} |
25 | } | 25 | } |
26 | }, | 26 | }, |
27 | "disableCheckbox": { | ||
28 | "module": "js/components/checkbox.reel", | ||
29 | "name": "Checkbox", | ||
30 | "properties": { | ||
31 | "element": { "#": "disable-checkbox" }, | ||
32 | "checked": true | ||
33 | } | ||
34 | }, | ||
35 | "name": { | 27 | "name": { |
36 | "module": "montage/ui/dynamic-text.reel", | 28 | "module": "montage/ui/dynamic-text.reel", |
37 | "name": "DynamicText", | 29 | "name": "DynamicText", |
@@ -114,12 +106,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
114 | </script> | 106 | </script> |
115 | </head> | 107 | </head> |
116 | <body> | 108 | <body> |
117 | <div id="style-sheet-container" class="style-sheet-container"> | 109 | <div data-montage-id="style-sheet-container" class="style-sheet-container"> |
118 | <div class="ss-icon"></div> | 110 | <div class="ss-icon"></div> |
119 | <!--<div id="disable-checkbox"></div>--> | 111 | <!--<div id="disable-checkbox"></div>--> |
120 | <span id="sheet-name"></span> | 112 | <span data-montage-id="sheet-name"></span> |
121 | <label>Media:</label> | 113 | <label>Media:</label> |
122 | <div id="media-input"></div> | 114 | <div data-montage-id="media-input"></div> |
123 | 115 | ||
124 | <div data-montage-id="style-sheet-edit" class="style-sheet-edit"> | 116 | <div data-montage-id="style-sheet-edit" class="style-sheet-edit"> |
125 | 117 | ||
diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js index 26b996ec..2d6e18ed 100644 --- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js +++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | |||
@@ -35,7 +35,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
35 | ///// Add rule button action | 35 | ///// Add rule button action |
36 | handleAddAction : { | 36 | handleAddAction : { |
37 | value: function(e) { | 37 | value: function(e) { |
38 | debugger; | 38 | this.stylesController.createStylesheet(); |
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | 41 | ||
@@ -45,6 +45,7 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
45 | handleStyleSheetsReady : { | 45 | handleStyleSheetsReady : { |
46 | value: function(e) { | 46 | value: function(e) { |
47 | this.documentName = this.stylesController.activeDocument.name; | 47 | this.documentName = this.stylesController.activeDocument.name; |
48 | this.styleSheets = this.stylesController.userStyleSheets; | ||
48 | this._initView = this.needsDraw = true; | 49 | this._initView = this.needsDraw = true; |
49 | } | 50 | } |
50 | }, | 51 | }, |
@@ -60,7 +61,6 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
60 | prepareForDraw : { | 61 | prepareForDraw : { |
61 | value: function() { | 62 | value: function() { |
62 | this.eventManager.addEventListener("styleSheetsReady", this, false); | 63 | this.eventManager.addEventListener("styleSheetsReady", this, false); |
63 | this.eventManager.addEventListener("newStyleSheet", this, false); | ||
64 | } | 64 | } |
65 | }, | 65 | }, |
66 | draw : { | 66 | draw : { |
@@ -68,7 +68,6 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
68 | if(this._initView) { | 68 | if(this._initView) { |
69 | this.noDocumentCondition = false; | 69 | this.noDocumentCondition = false; |
70 | this.showToolbar = true; | 70 | this.showToolbar = true; |
71 | this.styleSheets = this.stylesController.userStyleSheets; | ||
72 | this._initView = false; | 71 | this._initView = false; |
73 | } | 72 | } |
74 | 73 | ||
@@ -110,11 +109,6 @@ exports.StyleSheetsView = Montage.create(Component, { | |||
110 | } | 109 | } |
111 | } | 110 | } |
112 | }, | 111 | }, |
113 | handleNewStyleSheet : { | ||
114 | value: function(e) { | ||
115 | this.styleSheets.push(e._event.detail); | ||
116 | } | ||
117 | }, | ||
118 | handleResizeStart: { | 112 | handleResizeStart: { |
119 | value:function(e) { | 113 | value:function(e) { |
120 | this.isResizing = true; | 114 | this.isResizing = true; |