From f22979a59d14990de37dc8c55abef3ce58cf5511 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Tue, 19 Jan 2016 02:59:38 +0100 Subject: [PATCH] General updates --- .gitignore | 1 + Gruntfile.js | 2 +- LICENSE.md | 4 +- README.md | 38 +- bundle/dev.js | 60 -- bundle/panel/config/config.js | 48 -- bundle/style_manager/config/config.js | 431 ------------- index.html | 4 +- .../asset_manager/config/config.js | 0 {bundle => src}/asset_manager/main.js | 0 {bundle => src}/asset_manager/model/Asset.js | 0 .../asset_manager/model/AssetImage.js | 0 {bundle => src}/asset_manager/model/Assets.js | 0 .../asset_manager/template/assetImage.html | 0 .../asset_manager/template/fileUploader.html | 0 .../asset_manager/view/AssetImageView.js | 0 .../asset_manager/view/AssetView.js | 0 .../asset_manager/view/AssetsView.js | 0 .../asset_manager/view/FileUploader.js | 0 {bundle => src}/canvas/config/config.js | 0 {bundle => src}/canvas/main.js | 0 {bundle => src}/canvas/model/Canvas.js | 0 {bundle => src}/canvas/view/CanvasView.js | 4 +- {bundle => src}/code_manager/config/config.js | 0 {bundle => src}/code_manager/main.js | 0 .../code_manager/model/CodeMirrorEditor.js | 0 .../code_manager/model/CssGenerator.js | 0 .../code_manager/model/EditorInterface.js | 0 .../code_manager/model/GeneratorInterface.js | 0 .../code_manager/model/HtmlGenerator.js | 0 .../code_manager/model/JsonGenerator.js | 0 .../code_manager/template/editor.html | 0 .../code_manager/view/EditorView.js | 0 {bundle => src}/commands/config/config.js | 0 {bundle => src}/commands/main.js | 2 +- {bundle => src}/commands/model/Command.js | 0 {bundle => src}/commands/model/Commands.js | 0 .../commands/view/CommandAbstract.js | 6 +- .../commands/view/CreateComponent.js | 9 +- .../commands/view/DeleteComponent.js | 4 - .../commands/view/ExportTemplate.js | 0 .../commands/view/ImageComponent.js | 8 +- {bundle => src}/commands/view/InsertCustom.js | 11 +- .../commands/view/MoveComponent.js | 12 +- {bundle => src}/commands/view/OpenLayers.js | 0 .../commands/view/OpenStyleManager.js | 0 .../commands/view/ResizeComponent.js | 16 +- .../commands/view/SelectComponent.js | 13 +- .../commands/view/SelectPosition.js | 29 +- .../commands/view/SwitchVisibility.js | 0 .../commands/view/TextComponent.js | 16 +- {bundle => src}/config/require-config.js | 2 +- src/demo.js | 566 ++++++++++++++++++ .../dom_components/config/config.js | 10 +- {bundle => src}/dom_components/main.js | 10 +- .../dom_components/model/Component.js | 1 + .../dom_components/model/ComponentImage.js | 0 .../dom_components/model/ComponentText.js | 0 .../dom_components/model/Components.js | 0 .../dom_components/view/ComponentImageView.js | 0 .../dom_components/view/ComponentTextView.js | 5 +- .../dom_components/view/ComponentView.js | 31 - .../dom_components/view/ComponentsView.js | 0 {bundle => src}/editor/config/config.js | 5 +- {bundle => src}/editor/main.js | 0 {bundle => src}/editor/model/Editor.js | 44 +- {bundle => src}/editor/view/EditorView.js | 6 +- {bundle => src}/main.js | 2 +- {bundle => src}/modal_dialog/config/config.js | 0 {bundle => src}/modal_dialog/main.js | 0 {bundle => src}/modal_dialog/model/Modal.js | 0 .../modal_dialog/template/modal.html | 0 .../modal_dialog/view/ModalView.js | 1 - {bundle => src}/navigator/config/config.js | 0 {bundle => src}/navigator/main.js | 0 {bundle => src}/navigator/template/item.html | 0 {bundle => src}/navigator/view/ItemSort.js | 0 {bundle => src}/navigator/view/ItemView.js | 0 {bundle => src}/navigator/view/ItemsView.js | 0 src/panels/config/config.js | 14 + {bundle/panel => src/panels}/main.js | 0 {bundle/panel => src/panels}/model/Button.js | 0 {bundle/panel => src/panels}/model/Buttons.js | 0 {bundle/panel => src/panels}/model/Panel.js | 0 {bundle/panel => src/panels}/model/Panels.js | 0 .../panel => src/panels}/view/ButtonView.js | 2 - .../panel => src/panels}/view/ButtonsView.js | 0 .../panel => src/panels}/view/PanelView.js | 0 .../panel => src/panels}/view/PanelsView.js | 0 .../rich_text_editor/config/config.js | 0 {bundle => src}/rich_text_editor/main.js | 0 .../rich_text_editor/model/CommandButton.js | 0 .../rich_text_editor/model/CommandButtons.js | 0 .../view/CommandButtonView.js | 0 .../view/CommandButtonsView.js | 0 .../storage_manager/config/config.js | 0 {bundle => src}/storage_manager/main.js | 0 .../storage_manager/model/LocalStorage.js | 0 .../storage_manager/model/RemoteStorage.js | 0 .../storage_manager/model/StorageInterface.js | 0 src/style_manager/config/config.js | 11 + {bundle => src}/style_manager/main.js | 0 {bundle => src}/style_manager/model/Layer.js | 0 {bundle => src}/style_manager/model/Layers.js | 0 .../style_manager/model/Properties.js | 0 .../style_manager/model/Property.js | 0 {bundle => src}/style_manager/model/Sector.js | 0 .../style_manager/model/Sectors.js | 0 .../style_manager/templates/layer.html | 0 .../templates/propertyColor.html | 0 .../templates/propertyComposite.html | 0 .../style_manager/templates/propertyFile.html | 0 .../templates/propertyInteger.html | 0 .../templates/propertyLabel.html | 0 .../templates/propertyRadio.html | 0 .../templates/propertySelect.html | 0 .../templates/propertyStack.html | 0 .../style_manager/view/LayerView.js | 0 .../style_manager/view/LayersView.js | 0 .../style_manager/view/PropertiesView.js | 0 .../style_manager/view/PropertyColorView.js | 0 .../view/PropertyCompositeView.js | 0 .../style_manager/view/PropertyFileView.js | 0 .../style_manager/view/PropertyIntegerView.js | 12 +- .../style_manager/view/PropertyRadioView.js | 6 +- .../style_manager/view/PropertySelectView.js | 0 .../style_manager/view/PropertyStackView.js | 0 .../style_manager/view/PropertyView.js | 5 + .../style_manager/view/SectorView.js | 0 .../style_manager/view/SectorsView.js | 0 styles/css/main.css | 15 +- styles/css/main.css.map | 2 +- styles/scss/main.scss | 11 +- test/config/config.js | 2 +- test/runner/main.js | 2 +- 135 files changed, 755 insertions(+), 728 deletions(-) delete mode 100644 bundle/dev.js delete mode 100644 bundle/panel/config/config.js delete mode 100644 bundle/style_manager/config/config.js rename {bundle => src}/asset_manager/config/config.js (100%) rename {bundle => src}/asset_manager/main.js (100%) rename {bundle => src}/asset_manager/model/Asset.js (100%) rename {bundle => src}/asset_manager/model/AssetImage.js (100%) rename {bundle => src}/asset_manager/model/Assets.js (100%) rename {bundle => src}/asset_manager/template/assetImage.html (100%) rename {bundle => src}/asset_manager/template/fileUploader.html (100%) rename {bundle => src}/asset_manager/view/AssetImageView.js (100%) rename {bundle => src}/asset_manager/view/AssetView.js (100%) rename {bundle => src}/asset_manager/view/AssetsView.js (100%) rename {bundle => src}/asset_manager/view/FileUploader.js (100%) rename {bundle => src}/canvas/config/config.js (100%) rename {bundle => src}/canvas/main.js (100%) rename {bundle => src}/canvas/model/Canvas.js (100%) rename {bundle => src}/canvas/view/CanvasView.js (83%) rename {bundle => src}/code_manager/config/config.js (100%) rename {bundle => src}/code_manager/main.js (100%) rename {bundle => src}/code_manager/model/CodeMirrorEditor.js (100%) rename {bundle => src}/code_manager/model/CssGenerator.js (100%) rename {bundle => src}/code_manager/model/EditorInterface.js (100%) rename {bundle => src}/code_manager/model/GeneratorInterface.js (100%) rename {bundle => src}/code_manager/model/HtmlGenerator.js (100%) rename {bundle => src}/code_manager/model/JsonGenerator.js (100%) rename {bundle => src}/code_manager/template/editor.html (100%) rename {bundle => src}/code_manager/view/EditorView.js (100%) rename {bundle => src}/commands/config/config.js (100%) rename {bundle => src}/commands/main.js (96%) rename {bundle => src}/commands/model/Command.js (100%) rename {bundle => src}/commands/model/Commands.js (100%) rename {bundle => src}/commands/view/CommandAbstract.js (85%) rename {bundle => src}/commands/view/CreateComponent.js (97%) rename {bundle => src}/commands/view/DeleteComponent.js (94%) rename {bundle => src}/commands/view/ExportTemplate.js (100%) rename {bundle => src}/commands/view/ImageComponent.js (76%) rename {bundle => src}/commands/view/InsertCustom.js (85%) rename {bundle => src}/commands/view/MoveComponent.js (95%) rename {bundle => src}/commands/view/OpenLayers.js (100%) rename {bundle => src}/commands/view/OpenStyleManager.js (100%) rename {bundle => src}/commands/view/ResizeComponent.js (74%) rename {bundle => src}/commands/view/SelectComponent.js (96%) rename {bundle => src}/commands/view/SelectPosition.js (92%) rename {bundle => src}/commands/view/SwitchVisibility.js (100%) rename {bundle => src}/commands/view/TextComponent.js (74%) rename {bundle => src}/config/require-config.js (95%) create mode 100644 src/demo.js rename {bundle => src}/dom_components/config/config.js (54%) rename {bundle => src}/dom_components/main.js (80%) rename {bundle => src}/dom_components/model/Component.js (97%) rename {bundle => src}/dom_components/model/ComponentImage.js (100%) rename {bundle => src}/dom_components/model/ComponentText.js (100%) rename {bundle => src}/dom_components/model/Components.js (100%) rename {bundle => src}/dom_components/view/ComponentImageView.js (100%) rename {bundle => src}/dom_components/view/ComponentTextView.js (92%) rename {bundle => src}/dom_components/view/ComponentView.js (69%) rename {bundle => src}/dom_components/view/ComponentsView.js (100%) rename {bundle => src}/editor/config/config.js (95%) rename {bundle => src}/editor/main.js (100%) rename {bundle => src}/editor/model/Editor.js (91%) rename {bundle => src}/editor/view/EditorView.js (80%) rename {bundle => src}/main.js (99%) rename {bundle => src}/modal_dialog/config/config.js (100%) rename {bundle => src}/modal_dialog/main.js (100%) rename {bundle => src}/modal_dialog/model/Modal.js (100%) rename {bundle => src}/modal_dialog/template/modal.html (100%) rename {bundle => src}/modal_dialog/view/ModalView.js (98%) rename {bundle => src}/navigator/config/config.js (100%) rename {bundle => src}/navigator/main.js (100%) rename {bundle => src}/navigator/template/item.html (100%) rename {bundle => src}/navigator/view/ItemSort.js (100%) rename {bundle => src}/navigator/view/ItemView.js (100%) rename {bundle => src}/navigator/view/ItemsView.js (100%) create mode 100644 src/panels/config/config.js rename {bundle/panel => src/panels}/main.js (100%) rename {bundle/panel => src/panels}/model/Button.js (100%) rename {bundle/panel => src/panels}/model/Buttons.js (100%) rename {bundle/panel => src/panels}/model/Panel.js (100%) rename {bundle/panel => src/panels}/model/Panels.js (100%) rename {bundle/panel => src/panels}/view/ButtonView.js (98%) rename {bundle/panel => src/panels}/view/ButtonsView.js (100%) rename {bundle/panel => src/panels}/view/PanelView.js (100%) rename {bundle/panel => src/panels}/view/PanelsView.js (100%) rename {bundle => src}/rich_text_editor/config/config.js (100%) rename {bundle => src}/rich_text_editor/main.js (100%) rename {bundle => src}/rich_text_editor/model/CommandButton.js (100%) rename {bundle => src}/rich_text_editor/model/CommandButtons.js (100%) rename {bundle => src}/rich_text_editor/view/CommandButtonView.js (100%) rename {bundle => src}/rich_text_editor/view/CommandButtonsView.js (100%) rename {bundle => src}/storage_manager/config/config.js (100%) rename {bundle => src}/storage_manager/main.js (100%) rename {bundle => src}/storage_manager/model/LocalStorage.js (100%) rename {bundle => src}/storage_manager/model/RemoteStorage.js (100%) rename {bundle => src}/storage_manager/model/StorageInterface.js (100%) create mode 100644 src/style_manager/config/config.js rename {bundle => src}/style_manager/main.js (100%) rename {bundle => src}/style_manager/model/Layer.js (100%) rename {bundle => src}/style_manager/model/Layers.js (100%) rename {bundle => src}/style_manager/model/Properties.js (100%) rename {bundle => src}/style_manager/model/Property.js (100%) rename {bundle => src}/style_manager/model/Sector.js (100%) rename {bundle => src}/style_manager/model/Sectors.js (100%) rename {bundle => src}/style_manager/templates/layer.html (100%) rename {bundle => src}/style_manager/templates/propertyColor.html (100%) rename {bundle => src}/style_manager/templates/propertyComposite.html (100%) rename {bundle => src}/style_manager/templates/propertyFile.html (100%) rename {bundle => src}/style_manager/templates/propertyInteger.html (100%) rename {bundle => src}/style_manager/templates/propertyLabel.html (100%) rename {bundle => src}/style_manager/templates/propertyRadio.html (100%) rename {bundle => src}/style_manager/templates/propertySelect.html (100%) rename {bundle => src}/style_manager/templates/propertyStack.html (100%) rename {bundle => src}/style_manager/view/LayerView.js (100%) rename {bundle => src}/style_manager/view/LayersView.js (100%) rename {bundle => src}/style_manager/view/PropertiesView.js (100%) rename {bundle => src}/style_manager/view/PropertyColorView.js (100%) rename {bundle => src}/style_manager/view/PropertyCompositeView.js (100%) rename {bundle => src}/style_manager/view/PropertyFileView.js (100%) rename {bundle => src}/style_manager/view/PropertyIntegerView.js (93%) rename {bundle => src}/style_manager/view/PropertyRadioView.js (86%) rename {bundle => src}/style_manager/view/PropertySelectView.js (100%) rename {bundle => src}/style_manager/view/PropertyStackView.js (100%) rename {bundle => src}/style_manager/view/PropertyView.js (96%) rename {bundle => src}/style_manager/view/SectorView.js (100%) rename {bundle => src}/style_manager/view/SectorsView.js (100%) diff --git a/.gitignore b/.gitignore index 4e3d79d16..921f98181 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store .settings/ +.sass-cache/ .project private/ diff --git a/Gruntfile.js b/Gruntfile.js index f2bf0afb2..3f4664067 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,6 @@ module.exports = function(grunt) { - var appPath = 'bundle', + var appPath = 'src', buildPath = 'dist', configPath = 'config/require-config.js'; diff --git a/LICENSE.md b/LICENSE.md index 58b6e3575..2bac3d6a4 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,4 @@ -# Grapes.js - -Copyright (c) Artur Arseniev +Copyright (c) 2016, Artur Arseniev All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/README.md b/README.md index 39af52c07..3c19ecd15 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,27 @@ -# README # +# Grapes -This README would normally document whatever steps are necessary to get your application up and running. +Grapes is a free and open source WTE (Web Template Editor) for building HTML templates to be used inside sites, webapps, newsletters or anything else. +Be aware that is not a 'Website Builder' but a tool to create HTML structure and containers for contents. The great thing about Grapes is that you +can customize it, extend it or even integrate with other applications. -### What is this repository for? ### + -* Quick summary -* Version -* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo) +### Install as stand-alone + +```sh +$ npm install +``` + +### Usage + +### API +cooming soon - Slate + +### Testing + +### Contributing + +usual pull request ### How do I get set up? ### @@ -16,14 +31,3 @@ This README would normally document whatever steps are necessary to get your app * Database configuration * How to run tests * Deployment instructions - -### Contribution guidelines ### - -* Writing tests -* Code review -* Other guidelines - -### Who do I talk to? ### - -* Repo owner or admin -* Other community or team contact \ No newline at end of file diff --git a/bundle/dev.js b/bundle/dev.js deleted file mode 100644 index 9729fee9c..000000000 --- a/bundle/dev.js +++ /dev/null @@ -1,60 +0,0 @@ -require(['bundle/config/require-config.js'], function() { - - require(['editor/main'],function (Grapes){ - var grapes = new Grapes({ - storageType: 'local', - remoteStorage: { - urlStore : 'http://test.localhost/wte/index.php', - urlLoad : 'http://test.localhost/wte/read.php', - paramsStore : { type:'homeTemplate',}, - paramsLoad : { type:'homeTemplate',}, - }, - assetManager: { - storageType : '', - storeOnChange : true, - storeAfterUpload : true, - assets : [ - { type: 'image', src : 'http://placehold.it/350x250/78c5d6/fff/image1.jpg', date: '2015-01-01',height:350, width:250}, - { type: 'image', src : 'http://placehold.it/350x250/459ba8/fff/image2.jpg', date: '2015-02-01',height:350, width:250}, - { type: 'image', src : 'http://placehold.it/350x250/79c267/fff/image3.jpg', date: '2015-02-01',height:350, width:250}, - { type: 'image', src : 'http://placehold.it/350x250/c5d647/fff/image4.jpg', date: '2015-02-01',height:350, width:250}, - { type: 'image', src : 'http://placehold.it/350x250/f28c33/fff/image5.jpg', date: '2015-02-01',height:350, width:250}, - { type: 'image', src : 'http://placehold.it/350x250/e868a2/fff/image6.jpg', date: '2015-02-01',height:350, width:250}, - { type: 'image', src : 'http://placehold.it/350x250/cc4360/fff/image7.jpg', date: '2015-02-01',height:350, width:250}, - ] - }, - styleManager : {}, - defaultComponents: [ { style: {'width':'500px', 'height': '35px', 'margin':'0 auto',}, }, - { style: {'width':'500px', 'height': '35px', 'margin':'0 auto',}, }, - { style: {'width':'500px', 'height': '35px', 'margin':'0 auto',}, }, - { style: {'width':'400px', 'height': '300px', 'margin':'0 auto', 'padding':'5px'}, - components: [{ style: {'width':'130px','height': '30px','float':'left'}}, - { style: {'width':'50px','height': '50px','float':'left'},}, - { style: {'width':'80px','height': '80px','float':'left'},}, - { style: {'width':'50px','height': '50px','float':'left'},}, - { style: {'width':'80px','height': '70px','float':'left'},}, - { style: {'width':'50px','height': '80px','float':'left'},}, - { style: {'width':'80px','height': '50px','float':'left'},}, - { style: {'width':'80px','height': '50px','float':'left'},}, - { style: {'width':'50px','height': '50px','float':'left'},}, - { style: {'width':'80px','height': '50px','float':'left'},}, - { style: {'width':'80px','height': '50px','float':'left'},}, - { style: {'width':'50px','height': '50px','float':'left'},}, - { style: {'width':'80px','height': '50px','float':'left'},}, - { style: {'width':'75px','height': '50px','clear':'both'}}] - }, - { style: {'width':'700px', 'height': '250px', 'margin':'0 auto'}, - components: [{ style: {'width':'100px','height': '30px','float':'left'}}, - { style: {'width':'200px','height': '50px','float':'left'},}, - { style: {'width':'150px','height': '150px','float':'left'},}] - - }, - { style: {'width':'500px', 'height': '150px', 'margin':'0 auto'}, } - ], - }); - - grapes.render(); - - }); -}); - diff --git a/bundle/panel/config/config.js b/bundle/panel/config/config.js deleted file mode 100644 index 09e2a5fcf..000000000 --- a/bundle/panel/config/config.js +++ /dev/null @@ -1,48 +0,0 @@ -define(function () { - return { - stylePrefix : 'pn-', - - defaults : [{ - id : 'commands', - buttons : [{ id: 'select', className: 'fa fa-mouse-pointer', command: 'select-comp', attributes: {title:'Create'}}, - { id: 'create', className: 'fa fa-plus-square-o', command: 'create-comp', - buttons: [ - { id: 'image2', className: 'fa fa-picture-o', command: 'image-comp' }, - { id: 'move2', className: 'fa fa-arrows', command: 'move-comp' }, - { id: 'text2', className: 'fa fa-font' , command: 'text-comp' }, - { id: 'var', className: 'fa fa-hashtag', command: 'insert-var', - options: { content: '{{ VAR22 }}', terminateAfterInsert: false, }, }, - ] }, - { id: 'remove', className: 'fa fa-minus-square-o', command: 'delete-comp' }, - { id: 'move', className: 'fa fa-arrows', command: 'move-comp' }, - { id: 'resize', className: 'fa fa-arrows-alt', command: 'resize-comp' }, - { id: 'text', className: 'fa fa-font' , command: 'text-comp' }, - { id: 'image', className: 'fa fa-picture-o', command: 'image-comp' }, - { id: 'var', className: 'fa fa-hashtag', command: 'insert-var', - options: { content: '{{ VAR11 }}', terminateAfterInsert: true, }, - buttons: [ - { id: 'image2', className: 'fa fa-picture-o', command: 'image-comp' }, - { id: 'move2', className: 'fa fa-arrows', command: 'move-comp' }, - { id: 'text2', className: 'fa fa-font' , command: 'text-comp' }, - { id: 'var', className: 'fa fa-hashtag', command: 'insert-var', - options: { content: '{{ VAR22 }}', terminateAfterInsert: false, }, }, - ]}, - ], - },{ - id : 'options', - buttons : [{ id: 'visibility', className: 'fa fa-eye', command: 'sw-visibility', active: true, context: 'sw-visibility' }, - //{ id: 'select2', className: 'fa fa-mouse-pointer', command: 'select-comp' }, - { id: 'export', className: 'fa fa-code', command: 'export-template' },], - },{ - id : 'views', - buttons : [{ id: 'open-sm', className: 'fa fa-paint-brush', command: 'open-sm'}, - { id: 'open-layers', className: 'fa fa-bars', command: 'open-layers' },], - }], - - // Editor model - em : null, - - // Delay before show children buttons (in milliseconds) - delayBtnsShow : 300, - }; -}); \ No newline at end of file diff --git a/bundle/style_manager/config/config.js b/bundle/style_manager/config/config.js deleted file mode 100644 index 789cc68ac..000000000 --- a/bundle/style_manager/config/config.js +++ /dev/null @@ -1,431 +0,0 @@ -define(function () { - return { - - stylePrefix : 'sm-', - - target : null, - //sectors: [], - sectors: [{ - name: 'Positions', - properties:[{ - name: 'Alignment', - property: 'float', - type: 'radio', - defaults : 'none', - list: [{ - value : 'none', - //icon: 'none', - info: 'None', - },{ - value : 'left', - info: 'Float element to the left', - //icon: 'float-left', - },{ - value : '0 auto', - //icon: 'float-center', - info: 'Center the element', - property: 'margin' - },{ - value : 'right', - info: 'Float element to the right', - //icon: 'float-right', - }], - }], - },{ - name: 'Dimension', - properties:[{ - name: 'Width', - property: 'width', - type: 'integer', - units: ['px','%'], - defaults : 'auto', - min: 0, - },{ - name: 'Height', - property: 'height', - type: 'integer', - units: ['px','%'], - defaults : 'auto', - min: 0, - },], - },{ - name: 'Typography', - properties:[{ - name: 'Font', - property: 'font-family', - type: 'select', - defaults : 'Arial, Helvetica, sans-serif', - list: [{ - value : 'Arial, Helvetica, sans-serif', - name : 'Arial', - style: 'font-family: Arial, Helvetica, sans-serif', - },{ - value : '"Arial Black", Gadget, sans-serif', - style: 'font-family: "Arial Black", Gadget, sans-serif', - name : 'Arial Black', - },{ - value : '"Brush Script MT", sans-serif', - style: 'font-family: "Brush Script MT", sans-serif', - name : 'Brush Script MT', - },{ - value : '"Comic Sans MS", cursive, sans-serif', - style: 'font-family: "Comic Sans MS", cursive, sans-serif', - name : 'Comica Sans', - },{ - value : '"Courier New", Courier, monospace', - style: 'font-family: "Courier New", Courier, monospace', - name : 'Courier New', - },{ - value : 'Georgia, serif', - style: 'font-family: Georgia, serif', - name : 'Georgia', - },{ - value : 'Helvetica, serif', - style: 'font-family: Helvetica, serif', - name : 'Helvetica', - },{ - value : 'Impact, Charcoal, sans-serif', - style: 'font-family: Impact, Charcoal, sans-serif', - name : 'Impact', - },{ - value : '"Lucida Sans Unicode", "Lucida Grande", sans-serif', - style: 'font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif', - name : 'Lucida Sans', - },{ - value : 'Tahoma, Geneva, sans-serif', - style: 'font-family: Tahoma, Geneva, sans-serif', - name : 'Tahoma', - },{ - value : '"Times New Roman", Times, serif', - style: 'font-family: "Times New Roman", Times, serif', - name : 'Times New Roman', - },{ - value : '"Trebuchet MS", Helvetica, sans-serif', - style: 'font-family: "Trebuchet MS", Helvetica, sans-serif', - name : 'Trebuchet', - },{ - value : 'Verdana, Geneva, sans-serif', - style: 'font-family: Verdana, Geneva, sans-serif', - name : 'Verdana', - }], - },{ - name: 'Weight', - property: 'font-weight', - type: 'select', - defaults : '400', - list: [{ value : '100', name : 'Thin', }, - { value : '200', name : 'Extra-Light', }, - { value : '300', name : 'Light', }, - { value : '400', name : 'Normal', }, - { value : '500', name : 'Medium',}, - { value : '600', name : 'Semi-Bold',}, - { value : '700', name : 'Bold', }, - { value : '800', name : 'Extra-Bold',}, - { value : '900', name : 'Ultra-Bold', }], - },{ - name: 'Text align', - property: 'text-align', - type: 'radio', - defaults : 'left', - list: [{ value : 'left', name : 'Left', style:"font-weight:bold", }, - { value : 'center', name : 'Center', }, - { value : 'right', name : 'Right', }, - { value : 'justify', name : 'Justify', },], - },{ - name: 'Weight', - property: 'font-weight', - type: 'select', - defaults : '400', - list: [{ value : '100', name : 'Thin', }, - { value : '200', name : 'Extra-Light', }, - { value : '300', name : 'Light', }, - { value : '400', name : 'Normal', }, - { value : '500', name : 'Medium',}, - { value : '600', name : 'Semi-Bold',}, - { value : '700', name : 'Bold', }, - { value : '800', name : 'Extra-Bold',}, - { value : '900', name : 'Ultra-Bold', }], - }], - },{ - name: 'Decorations', - properties: [{ - name: 'Borders radius', - property: 'border-radius', - type: 'integer', - units: ['px'], - unit: 'px', - defaults : '0', - min: 0, - },{ - name: 'Borders radius', - property: 'border-radius', - type: 'composite', - properties:[{ - name: 'Top', - property: 'pad-top', - type: 'integer', - units: ['px','%'], - defaults : 0, - min: 0, - },{ - name: 'Right', - property: 'pad-right', - type: 'integer', - units: ['px','%'], - min: 0, - defaults : 0, - },{ - name: 'Bottom', - property: 'pad-bot', - type: 'integer', - units: ['px','%'], - min: 0, - defaults : 0, - },{ - name: 'Left', - property: 'pad-left', - type: 'integer', - units: ['px'], - min: 0, - defaults : 0, - },], - }, - { - name: 'Box shadow', - property: 'box-shadow', - type: 'stack', - preview: true, - properties:[{ - name: 'Shadow type', - property: 'shadow-type', - type: 'select', - defaults: '', - list: [ { value : '', name : 'Outside', }, - { value : 'inset', name : 'Inside', }], - },{ - name: 'X position', - property: 'shadow-x', - type: 'integer', - units: ['px','%'], - defaults : 0, - },{ - name: 'Y position', - property: 'shadow-y', - type: 'integer', - units: ['px','%'], - defaults : 0, - },{ - name: 'Blur', - property: 'shadow-blur', - type: 'integer', - units: ['px'], - defaults : 5, - min: 0, - },{ - name: 'Spread', - property: 'shadow-spread', - type: 'integer', - units: ['px'], - defaults : 0, - },{ - name: 'Color', - property: 'shadow-color', - type: 'color', - defaults: 'black', - }, - ], - },{ - name: 'Background', - property: 'background', - type: 'stack', - preview: true, - properties:[{ - name: 'Image', - property: 'background-image', - type: 'file', - defaults: 'none', - }, - /*{ - name: 'Background position', - property: 'background-position', - type: 'composite', - properties: [ { - name: 'BpX', - property: 'bpx', - type: 'select', - defaults: 'left', - list: [ { value : 'left', name : 'Left', }, - { value : 'center', name : 'Center', }, - { value : 'right', name : 'Right', }], - },{ - name: 'BpY', - property: 'bpy', - type: 'select', - defaults: 'top', - list: [ { value : 'top', name : 'Top', }, - { value : 'center', name : 'Center', }, - { value : 'bottom', name : 'Bottom', }], - }, - ], - }*/ - { - name: 'Repeat', - property: 'background-repeat', - type: 'select', - defaults: 'repeat', - list: [{ value : 'repeat', name : 'Repeat', }, - { value : 'repeat-x', name : 'Repeat X', }, - { value : 'repeat-y', name : 'Repeat Y', }, - { value : 'no-repeat', name : 'No repeat', }], - }, - { - name: 'Position X', - property: 'bpx', - type: 'select', - defaults: 'left', - list: [ { value : 'left', name : 'Left', }, - { value : 'center', name : 'Center', }, - { value : 'right', name : 'Right', }], - },{ - name: 'Position Y', - property: 'bpy', - type: 'select', - defaults: 'top', - list: [ { value : 'top', name : 'Top', }, - { value : 'center', name : 'Center', }, - { value : 'bottom', name : 'Bottom', }], - },{ - name: 'Attach', - property: 'background-attachment', - type: 'select', - defaults: 'scroll', - list: [{ value : 'scroll', name : 'Scroll', }, - { value : 'fixed', name : 'Fixed', }, - { value : 'local', name : 'Local', }], - }, - /*{ - name: 'Background origin', - property: 'background-origin', - type: 'select', - defaults: 'padding-box', - list: [{ value : 'padding-box', name : 'Padding', }, - { value : 'border-box', name : 'Border', }, - { value : 'content-box', name : 'Content', }], - },{ - name: 'Background clip', - property: 'background-clip', - type: 'select', - defaults: 'border-box', - list: [{ value : 'border-box', name : 'Border', }, - { value : 'padding-box', name : 'Padding', }, - { value : 'content-box', name : 'Content', }], - },{ - name: 'Color', - property: 'background-color', - type: 'color', - defaults: 'black', - },*/ - ], - },{ - name: 'Transition', - property: 'transition', - type: 'stack', - preview: false, - properties:[{ - name: 'Property', - property: 'transition-property', - type: 'select', - defaults: '', - list: [{ value : 'width', name : 'Width', }, - { value : 'height', name : 'Height', }, - { value : 'background-color', name : 'Background', }], - },{ - name: 'Duration', - property: 'transition-duration', - type: 'integer', - units: ['s'], - defaults : '2', - min: 0, - },{ - name: 'Easing', - property: 'transition-timing-function', - type: 'select', - defaults: 'ease', - list: [{ value : 'linear', name : 'Linear', }, - { value : 'ease', name : 'Ease', }, - { value : 'ease-in', name : 'Ease-in', }, - { value : 'ease-out', name : 'Ease-out', }, - { value : 'ease-in-out', name : 'Ease-in-out', }], - }], - },{ - name: 'Perspective', - property: 'perspective', - type: 'integer', - units: ['px'], - defaults : '0', - min: 0, - },{ - name: 'Transform', - property: 'transform', - type: 'composite', - properties:[{ - name: 'Rotate X', - property: 'transform-rotate-x', - type: 'integer', - units: ['deg'], - defaults : '0', - functionName: 'rotateX', - },{ - name: 'Rotate Y', - property: 'transform-rotate-y', - type: 'integer', - units: ['deg'], - defaults : '0', - functionName: 'rotateY', - },{ - name: 'Rotate Z', - property: 'transform-rotate-z', - type: 'integer', - units: ['deg'], - defaults : '0', - functionName: 'rotateZ', - }], - }/*{ - name: 'Padding', - property: 'padding', - type: 'composite', - properties:[{ - name: 'Top', - property: 'pad-top', - type: 'integer', - units: ['px','%'], - defaults : 0, - min: 0, - },{ - name: 'Right', - property: 'pad-right', - type: 'integer', - units: ['px','%'], - min: 0, - defaults : 0, - },{ - name: 'Bottom', - property: 'pad-bot', - type: 'integer', - units: ['px','%'], - min: 0, - defaults : 0, - },{ - name: 'Left', - property: 'pad-left', - type: 'integer', - units: ['px'], - min: 0, - defaults : 0, - },], - },*/ - ], - } - ], - }; -}); \ No newline at end of file diff --git a/index.html b/index.html index dafcdfd02..a99a989a7 100755 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - WTE + Grapes @@ -10,6 +10,6 @@
- + diff --git a/bundle/asset_manager/config/config.js b/src/asset_manager/config/config.js similarity index 100% rename from bundle/asset_manager/config/config.js rename to src/asset_manager/config/config.js diff --git a/bundle/asset_manager/main.js b/src/asset_manager/main.js similarity index 100% rename from bundle/asset_manager/main.js rename to src/asset_manager/main.js diff --git a/bundle/asset_manager/model/Asset.js b/src/asset_manager/model/Asset.js similarity index 100% rename from bundle/asset_manager/model/Asset.js rename to src/asset_manager/model/Asset.js diff --git a/bundle/asset_manager/model/AssetImage.js b/src/asset_manager/model/AssetImage.js similarity index 100% rename from bundle/asset_manager/model/AssetImage.js rename to src/asset_manager/model/AssetImage.js diff --git a/bundle/asset_manager/model/Assets.js b/src/asset_manager/model/Assets.js similarity index 100% rename from bundle/asset_manager/model/Assets.js rename to src/asset_manager/model/Assets.js diff --git a/bundle/asset_manager/template/assetImage.html b/src/asset_manager/template/assetImage.html similarity index 100% rename from bundle/asset_manager/template/assetImage.html rename to src/asset_manager/template/assetImage.html diff --git a/bundle/asset_manager/template/fileUploader.html b/src/asset_manager/template/fileUploader.html similarity index 100% rename from bundle/asset_manager/template/fileUploader.html rename to src/asset_manager/template/fileUploader.html diff --git a/bundle/asset_manager/view/AssetImageView.js b/src/asset_manager/view/AssetImageView.js similarity index 100% rename from bundle/asset_manager/view/AssetImageView.js rename to src/asset_manager/view/AssetImageView.js diff --git a/bundle/asset_manager/view/AssetView.js b/src/asset_manager/view/AssetView.js similarity index 100% rename from bundle/asset_manager/view/AssetView.js rename to src/asset_manager/view/AssetView.js diff --git a/bundle/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js similarity index 100% rename from bundle/asset_manager/view/AssetsView.js rename to src/asset_manager/view/AssetsView.js diff --git a/bundle/asset_manager/view/FileUploader.js b/src/asset_manager/view/FileUploader.js similarity index 100% rename from bundle/asset_manager/view/FileUploader.js rename to src/asset_manager/view/FileUploader.js diff --git a/bundle/canvas/config/config.js b/src/canvas/config/config.js similarity index 100% rename from bundle/canvas/config/config.js rename to src/canvas/config/config.js diff --git a/bundle/canvas/main.js b/src/canvas/main.js similarity index 100% rename from bundle/canvas/main.js rename to src/canvas/main.js diff --git a/bundle/canvas/model/Canvas.js b/src/canvas/model/Canvas.js similarity index 100% rename from bundle/canvas/model/Canvas.js rename to src/canvas/model/Canvas.js diff --git a/bundle/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js similarity index 83% rename from bundle/canvas/view/CanvasView.js rename to src/canvas/view/CanvasView.js index 101274bb4..56338385f 100644 --- a/bundle/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -5,7 +5,7 @@ function(Backbone) { * */ return Backbone.View.extend({ - id: 'canvas', + //id: 'canvas', initialize: function(o) { this.config = o.config; @@ -17,7 +17,7 @@ function(Backbone) { if(this.wrapper && typeof this.wrapper.render == 'function'){ this.$el.append( this.wrapper.render() ); } - this.$el.attr('class', this.className); + this.$el.attr({class: this.className, id: this.config.canvasId}); return this; }, diff --git a/bundle/code_manager/config/config.js b/src/code_manager/config/config.js similarity index 100% rename from bundle/code_manager/config/config.js rename to src/code_manager/config/config.js diff --git a/bundle/code_manager/main.js b/src/code_manager/main.js similarity index 100% rename from bundle/code_manager/main.js rename to src/code_manager/main.js diff --git a/bundle/code_manager/model/CodeMirrorEditor.js b/src/code_manager/model/CodeMirrorEditor.js similarity index 100% rename from bundle/code_manager/model/CodeMirrorEditor.js rename to src/code_manager/model/CodeMirrorEditor.js diff --git a/bundle/code_manager/model/CssGenerator.js b/src/code_manager/model/CssGenerator.js similarity index 100% rename from bundle/code_manager/model/CssGenerator.js rename to src/code_manager/model/CssGenerator.js diff --git a/bundle/code_manager/model/EditorInterface.js b/src/code_manager/model/EditorInterface.js similarity index 100% rename from bundle/code_manager/model/EditorInterface.js rename to src/code_manager/model/EditorInterface.js diff --git a/bundle/code_manager/model/GeneratorInterface.js b/src/code_manager/model/GeneratorInterface.js similarity index 100% rename from bundle/code_manager/model/GeneratorInterface.js rename to src/code_manager/model/GeneratorInterface.js diff --git a/bundle/code_manager/model/HtmlGenerator.js b/src/code_manager/model/HtmlGenerator.js similarity index 100% rename from bundle/code_manager/model/HtmlGenerator.js rename to src/code_manager/model/HtmlGenerator.js diff --git a/bundle/code_manager/model/JsonGenerator.js b/src/code_manager/model/JsonGenerator.js similarity index 100% rename from bundle/code_manager/model/JsonGenerator.js rename to src/code_manager/model/JsonGenerator.js diff --git a/bundle/code_manager/template/editor.html b/src/code_manager/template/editor.html similarity index 100% rename from bundle/code_manager/template/editor.html rename to src/code_manager/template/editor.html diff --git a/bundle/code_manager/view/EditorView.js b/src/code_manager/view/EditorView.js similarity index 100% rename from bundle/code_manager/view/EditorView.js rename to src/code_manager/view/EditorView.js diff --git a/bundle/commands/config/config.js b/src/commands/config/config.js similarity index 100% rename from bundle/commands/config/config.js rename to src/commands/config/config.js diff --git a/bundle/commands/main.js b/src/commands/main.js similarity index 96% rename from bundle/commands/main.js rename to src/commands/main.js index 099d786a9..f7743c53e 100644 --- a/bundle/commands/main.js +++ b/src/commands/main.js @@ -28,7 +28,7 @@ define(function(require) { this.defaultCommands['image-comp'] = require('./view/ImageComponent'); this.defaultCommands['move-comp'] = require('./view/MoveComponent'); this.defaultCommands['text-comp'] = require('./view/TextComponent'); - this.defaultCommands['insert-var'] = require('./view/InsertCustom'); + this.defaultCommands['insert-custom'] = require('./view/InsertCustom'); this.defaultCommands['export-template'] = require('./view/ExportTemplate'); this.defaultCommands['sw-visibility'] = require('./view/SwitchVisibility'); this.defaultCommands['open-layers'] = require('./view/OpenLayers'); diff --git a/bundle/commands/model/Command.js b/src/commands/model/Command.js similarity index 100% rename from bundle/commands/model/Command.js rename to src/commands/model/Command.js diff --git a/bundle/commands/model/Commands.js b/src/commands/model/Commands.js similarity index 100% rename from bundle/commands/model/Commands.js rename to src/commands/model/Commands.js diff --git a/bundle/commands/view/CommandAbstract.js b/src/commands/view/CommandAbstract.js similarity index 85% rename from bundle/commands/view/CommandAbstract.js rename to src/commands/view/CommandAbstract.js index bb914a9bd..9515c0c7a 100644 --- a/bundle/commands/view/CommandAbstract.js +++ b/src/commands/view/CommandAbstract.js @@ -12,14 +12,14 @@ define(['backbone'], initialize: function(o) { this.editorModel = this.em = o.em || {}; this.canvasId = o.canvasId || ''; - this.wrapperId = o.wrapperId || ''; + this.wrapperId = o.wrapperId || 'wrapper'; this.pfx = o.stylePrefix; this.hoverClass = this.pfx + 'hover'; this.badgeClass = this.pfx + 'badge'; this.plhClass = this.pfx + 'placeholder'; - this.setElement('#' + this.canvasId); + this.setElement(this.editorModel.get('$editor').find('#'+this.canvasId)); this.$canvas = this.$el; - this.$wrapper = $('#' + this.wrapperId); + this.$wrapper = this.$canvas.find('#'+this.wrapperId); this.init(o); }, diff --git a/bundle/commands/view/CreateComponent.js b/src/commands/view/CreateComponent.js similarity index 97% rename from bundle/commands/view/CreateComponent.js rename to src/commands/view/CreateComponent.js index a6ecc696b..ba2176b00 100644 --- a/bundle/commands/view/CreateComponent.js +++ b/src/commands/view/CreateComponent.js @@ -3,7 +3,7 @@ define(['backbone','./SelectPosition'], /** * @class CreateComponent * */ - return _.extend({},SelectPosition,{ + return _.extend({}, SelectPosition, { newElement : null, @@ -133,7 +133,7 @@ define(['backbone','./SelectPosition'], var index = posIndex || 0; if(this.posTargetCollection && this.posTargetModel.get('droppable')){ //Check config parameters for center in wrapper - if(this.config.firstCentered && (this.el == this.posTargetEl.get(0)) ){ + if(this.config.firstCentered && (this.$wrapper.get(0) == this.posTargetEl.get(0)) ){ component.style.margin = '0 auto'; } if(this.nearToFloat()) //Set not in flow if the nearest is too @@ -254,7 +254,9 @@ define(['backbone','./SelectPosition'], /** Run method * */ - run: function(){ + run: function(em, sender){ + this.sender = sender; + this.$el = this.$wrapper; this.enable(); }, @@ -262,6 +264,7 @@ define(['backbone','./SelectPosition'], * */ stop: function(){ this.removePositionPlaceholder(); //Removes placeholder from eventSelectPosition + this.stopSelectPosition(); this.$el.css('cursor',''); //Changes back aspect of the cursor this.$el.unbind(); //Removes all attached events } diff --git a/bundle/commands/view/DeleteComponent.js b/src/commands/view/DeleteComponent.js similarity index 94% rename from bundle/commands/view/DeleteComponent.js rename to src/commands/view/DeleteComponent.js index 703787cd2..d3c681987 100644 --- a/bundle/commands/view/DeleteComponent.js +++ b/src/commands/view/DeleteComponent.js @@ -11,10 +11,6 @@ define(['backbone', './SelectComponent'], }, enable: function(){ - - if(!this.$el.length) - this.$el = $('#' + this.canvasId); - var that = this; this.$el.find('*').mouseover(function (e){ e.stopPropagation(); diff --git a/bundle/commands/view/ExportTemplate.js b/src/commands/view/ExportTemplate.js similarity index 100% rename from bundle/commands/view/ExportTemplate.js rename to src/commands/view/ExportTemplate.js diff --git a/bundle/commands/view/ImageComponent.js b/src/commands/view/ImageComponent.js similarity index 76% rename from bundle/commands/view/ImageComponent.js rename to src/commands/view/ImageComponent.js index 78f2376b2..51c8099e7 100644 --- a/bundle/commands/view/ImageComponent.js +++ b/src/commands/view/ImageComponent.js @@ -1,4 +1,4 @@ -define(['backbone','./InsertCustom'], +define(['backbone', './InsertCustom'], function(Backbone, InsertCustom) { /** * @class ImageComponent @@ -9,7 +9,6 @@ define(['backbone','./InsertCustom'], * Trigger before insert * @param {Object} object * - * @return void * */ beforeInsert: function(object){ object.type = 'image'; @@ -17,7 +16,7 @@ define(['backbone','./InsertCustom'], if (!this.nearToFloat()) { object.style.display = 'block'; } - if (this.config.firstCentered && (this.el == this.posTargetEl.get(0)) ) { + if (this.config.firstCentered && (this.$wp.get(0) == this.posTargetEl.get(0)) ) { object.style.margin = '0 auto'; } }, @@ -26,12 +25,11 @@ define(['backbone','./InsertCustom'], * Trigger after insert * @param {Object} model Model created after insert * - * @return void * */ afterInsert: function(model){ model.trigger('dblclick'); if(this.sender) - this.sender.set('active',false); + this.sender.set('active', false); }, diff --git a/bundle/commands/view/InsertCustom.js b/src/commands/view/InsertCustom.js similarity index 85% rename from bundle/commands/view/InsertCustom.js rename to src/commands/view/InsertCustom.js index 894d03f33..88a907581 100644 --- a/bundle/commands/view/InsertCustom.js +++ b/src/commands/view/InsertCustom.js @@ -18,7 +18,8 @@ define(['backbone', './SelectPosition'], enable: function(){ SelectPosition.enable.apply(this, arguments); _.bindAll(this,'insertComponent'); - this.$el.on('click', this.insertComponent); + this.$wp = this.$wrapper; + this.$wp.on('click', this.insertComponent); }, /** @@ -27,17 +28,15 @@ define(['backbone', './SelectPosition'], * @return void * */ insertComponent: function(){ - this.$el.off('click', this.insertComponent); + this.$wp.off('click', this.insertComponent); this.stopSelectPosition(); this.removePositionPlaceholder(); var object = this.buildContent(); this.beforeInsert(object); var model = this.posTargetCollection.add(object, { at: this.posIndex, silent:false }); - if(this.opt.terminateAfterInsert && this.sender){ + if(this.opt.terminateAfterInsert && this.sender) this.sender.set('active',false); - //if(this.senderBtn.model.get('parentModel')) - //this.senderBtn.model.get('parentModel').set('active', false); - }else + else this.enable(); this.afterInsert(model, this); }, diff --git a/bundle/commands/view/MoveComponent.js b/src/commands/view/MoveComponent.js similarity index 95% rename from bundle/commands/view/MoveComponent.js rename to src/commands/view/MoveComponent.js index 29419d928..3deec45ff 100644 --- a/bundle/commands/view/MoveComponent.js +++ b/src/commands/view/MoveComponent.js @@ -13,14 +13,8 @@ define(['backbone', './SelectComponent','./SelectPosition'], }, enable: function(){ - - if(!this.$el.length){ - this.$el = $('#' + this.canvasId); - this.$canvas = this.$el; - this.canvasTop = this.$canvas.offset().top; - this.canvasLeft = this.$canvas.offset().left; - } - + this.canvasTop = this.$canvas.offset().top; + this.canvasLeft = this.$canvas.offset().left; this.$el.css('cursor','move'); this.$el.on('mousedown', this.startMove); this.startSelectComponent(); @@ -121,7 +115,7 @@ define(['backbone', './SelectComponent','./SelectPosition'], var modelTemp = targetCollection.add({css:{}}, { at: index }); var modelRemoved = collection.remove(model); targetCollection.add(modelRemoved, { at: index }); - targetCollection.remove(modelTemp); + targetCollection.remove(modelTemp);//{ avoidStore: 1 } }else console.warn("Invalid target position"); }, diff --git a/bundle/commands/view/OpenLayers.js b/src/commands/view/OpenLayers.js similarity index 100% rename from bundle/commands/view/OpenLayers.js rename to src/commands/view/OpenLayers.js diff --git a/bundle/commands/view/OpenStyleManager.js b/src/commands/view/OpenStyleManager.js similarity index 100% rename from bundle/commands/view/OpenStyleManager.js rename to src/commands/view/OpenStyleManager.js diff --git a/bundle/commands/view/ResizeComponent.js b/src/commands/view/ResizeComponent.js similarity index 74% rename from bundle/commands/view/ResizeComponent.js rename to src/commands/view/ResizeComponent.js index 11ecee2f9..3e498315a 100644 --- a/bundle/commands/view/ResizeComponent.js +++ b/src/commands/view/ResizeComponent.js @@ -27,13 +27,15 @@ define(['backbone', 'jqueryUi', './MoveComponent'], * @param object Component model * */ updateModel: function(el){ - var um = 'px'; - var model = el.element.data("model"); - delete model.get('style')['min-height']; //resize event removes fixed measures - delete model.get('style')['min-width']; - model.get('style').height = el.size.height+um; //update with new height and width - model.get('style').width = el.size.width+um; - model.get('style').overflow = 'auto'; + var um = 'px', + model = el.element.data("model"), + style = _.clone(model.get('style')); + delete style['min-height']; + delete style['min-width']; + style.height = el.size.height + um; + style.width = el.size.width + um; + style.overflow = 'auto'; + model.set('style', style); }, /** diff --git a/bundle/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js similarity index 96% rename from bundle/commands/view/SelectComponent.js rename to src/commands/view/SelectComponent.js index 119b6a910..8de22a80d 100644 --- a/bundle/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -13,10 +13,6 @@ define(function() { * */ startSelectComponent: function(){ var that = this; - - if(!this.$el.length) - this.$el = $('#' + this.canvasId); - this.$el.find('*').on('mouseover',function(e){ that.highlightComponent(e,this); }) .on('mouseout' ,function(e){ that.removeHighlightComponent(e,this); }) .on('click' ,function(e){ that.selectComponent(e,this); }); @@ -60,6 +56,9 @@ define(function() { * @return void * */ selectComponent: function(e, el){ + var s = $(el).data('model').get('stylable'); + if(!(s instanceof Array) && !s) + return; this.onSelect(e,el); //Callback on select }, @@ -67,7 +66,7 @@ define(function() { * @param Event * @param Object Selected element * */ - onSelect: function(e,el){ + onSelect: function(e, el){ e.stopPropagation(); if(this.$selected) //Check if already selected before this.$selected.removeClass('selected-component'); @@ -101,7 +100,7 @@ define(function() { this.updateBadgeLabel(model); var $el = $(el); if(!this.wrapper) - this.wrapper = $('#wrapper'); + this.wrapper = this.$wrapper; if(!this.wrapperTop) this.wrapperTop = this.wrapper.offset() ? this.wrapper.offset().top : 0; if(!this.wrapperLeft) @@ -117,7 +116,7 @@ define(function() { * @return void * */ createBadge: function (){ - this.badge = $('
', {class: this.badgeClass + " no-dots"}).appendTo('#' + this.wrapperId); + this.badge = $('
', {class: this.badgeClass + " no-dots"}).appendTo(this.$wrapper); }, /** Remove badge diff --git a/bundle/commands/view/SelectPosition.js b/src/commands/view/SelectPosition.js similarity index 92% rename from bundle/commands/view/SelectPosition.js rename to src/commands/view/SelectPosition.js index 4c120f3c3..f4d7c0b6d 100644 --- a/bundle/commands/view/SelectPosition.js +++ b/src/commands/view/SelectPosition.js @@ -5,8 +5,7 @@ define(function() { return { init: function(opt) { - _.bindAll(this,'selectingPosition','itemLeft'); - this.setElement('#'+this.wrapperId); + _.bindAll(this,'selectingPosition','itemLeft'); this.config = opt; }, @@ -30,17 +29,12 @@ define(function() { this.$plh = $('
', { class: this.plhClass + " no-dots" }) .css({'pointer-events':'none'}).data('helper',1); this.$plh.append( $('
', { class: this.plhClass + "-int no-dots" } ) ); - this.$plh.appendTo( this.$wp ); //Append helper to the canvas + this.$plh.appendTo( this.$wrapper ); return this.$plh; }, enable: function() { - if(!this.$el.length){ - this.setElement('#'+this.wrapperId); - this.$el = $('#'+this.wrapperId); - } - this.$el.css('cursor','pointer'); //changes aspect of the cursor this.startSelectPosition(); }, @@ -52,7 +46,7 @@ define(function() { startSelectPosition: function() { this.isPointed = false; - this.$el.on('mousemove', this.selectingPosition); + this.$wrapper.on('mousemove', this.selectingPosition); }, /** @@ -61,13 +55,13 @@ define(function() { * */ stopSelectPosition: function() { - this.$el.off('mousemove',this.selectingPosition); + this.$wrapper.off('mousemove',this.selectingPosition); this.posTargetCollection = null; this.posIndex = this.posMethod=='after' && this.cDim.length!==0 ? this.posIndex + 1 : this.posIndex; //Normalize if(this.cDim){ this.posIsLastEl = this.cDim.length!==0 && this.posMethod=='after' && this.posIndex==this.cDim.length; this.posTargetEl = (this.cDim.length===0 ? $(this.outsideElem) : - (!this.posIsLastEl ? $(this.cDim[this.posIndex][5]).parent() : $(this.outsideElem) )); + (!this.posIsLastEl && this.cDim[this.posIndex] ? $(this.cDim[this.posIndex][5]).parent() : $(this.outsideElem) )); this.posTargetModel = this.posTargetEl.data("model"); this.posTargetCollection = this.posTargetEl.data("model-comp"); } @@ -81,8 +75,8 @@ define(function() { { this.isPointed = true; - if(!this.$wp){ - this.$wp = $('#' + this.wrapperId); + if(!this.wp){ + this.$wp = this.$wrapper; this.wp = this.$wp[0]; } var wpO = this.$wp.offset(); @@ -353,7 +347,7 @@ define(function() { * */ removePositionPlaceholder: function() { - if(this.$plh) + if(this.$plh && this.$plh.length) this.$plh.remove(); this.$plh = null; }, @@ -361,15 +355,14 @@ define(function() { /* Run method */ run: function(){ this.enable(); - this.active = true; }, /* Stop method */ stop: function(){ this.removePositionPlaceholder(); - this.$el.css('cursor','');//changes back aspect of the cursor - this.$el.unbind();//removes all attached events - this.active = false; + this.stopSelectPosition(); + this.$wrapper.css('cursor','');//changes back aspect of the cursor + this.$wrapper.unbind();//removes all attached events } }; }); \ No newline at end of file diff --git a/bundle/commands/view/SwitchVisibility.js b/src/commands/view/SwitchVisibility.js similarity index 100% rename from bundle/commands/view/SwitchVisibility.js rename to src/commands/view/SwitchVisibility.js diff --git a/bundle/commands/view/TextComponent.js b/src/commands/view/TextComponent.js similarity index 74% rename from bundle/commands/view/TextComponent.js rename to src/commands/view/TextComponent.js index 48b2f7140..28125ba26 100644 --- a/bundle/commands/view/TextComponent.js +++ b/src/commands/view/TextComponent.js @@ -9,7 +9,6 @@ define(['backbone', './CreateComponent'], * This event is triggered at the beginning of a draw operation * @param {Object} component Object component before creation * - * @return void * */ beforeDraw: function(component){ component.type = 'text'; @@ -22,22 +21,13 @@ define(['backbone', './CreateComponent'], * This event is triggered at the end of a draw operation * @param {Object} model Component model created * - * @return void * */ afterDraw: function(model){ - if(!model.set) + if(!model || !model.set) return; model.trigger('focus'); - if(this.senderBtn) - this.senderBtn.set('active',false); - }, - - /** - * Run method - * */ - run: function(em, sender){ - this.enable(); - this.senderBtn = sender; + if(this.sender) + this.sender.set('active', false); }, }); diff --git a/bundle/config/require-config.js b/src/config/require-config.js similarity index 95% rename from bundle/config/require-config.js rename to src/config/require-config.js index 66bfd7bfa..f305969ee 100644 --- a/bundle/config/require-config.js +++ b/src/config/require-config.js @@ -44,6 +44,6 @@ require.config({ { name: 'CodeManager', location: 'code_manager', }, { name: 'Commands', location: 'commands', }, { name: 'Canvas', location: 'canvas', }, - { name: 'Panel', location: 'panel', } + { name: 'Panels', location: 'panels', } ] }); \ No newline at end of file diff --git a/src/demo.js b/src/demo.js new file mode 100644 index 000000000..abc9f8c45 --- /dev/null +++ b/src/demo.js @@ -0,0 +1,566 @@ +require(['src/config/require-config.js'], function() { + + require(['editor/main'],function (Grapes){ + var grapes = new Grapes({ + + container : '#wte-app', + + storageType: 'local', + + remoteStorage: { + urlStore : 'http://test.localhost/wte/index.php', + urlLoad : 'http://test.localhost/wte/read.php', + paramsStore : { type:'homeTemplate',}, + paramsLoad : { type:'homeTemplate',}, + }, + assetManager: { + storageType : '', + storeOnChange : true, + storeAfterUpload : true, + assets : [ + { type: 'image', src : 'http://placehold.it/350x250/78c5d6/fff/image1.jpg', date: '2015-01-01',height:350, width:250}, + { type: 'image', src : 'http://placehold.it/350x250/459ba8/fff/image2.jpg', date: '2015-02-01',height:350, width:250}, + { type: 'image', src : 'http://placehold.it/350x250/79c267/fff/image3.jpg', date: '2015-02-01',height:350, width:250}, + { type: 'image', src : 'http://placehold.it/350x250/c5d647/fff/image4.jpg', date: '2015-02-01',height:350, width:250}, + { type: 'image', src : 'http://placehold.it/350x250/f28c33/fff/image5.jpg', date: '2015-02-01',height:350, width:250}, + { type: 'image', src : 'http://placehold.it/350x250/e868a2/fff/image6.jpg', date: '2015-02-01',height:350, width:250}, + { type: 'image', src : 'http://placehold.it/350x250/cc4360/fff/image7.jpg', date: '2015-02-01',height:350, width:250}, + ] + }, + + panels: { + defaults : [{ + id : 'commands', + buttons : [{ + id : 'select', + className : 'fa fa-mouse-pointer', + command : 'select-comp', + attributes : { title : 'Select' } + },{ + id : 'create', + className : 'fa fa-plus-square-o', + command : 'create-comp', + attributes : { title : 'Create' }, + buttons : [ + { id: 'create2', className: 'fa fa-plus-square-o', command: 'create-comp', attributes: { title: 'Create' },}, + { id: 'box100', className: 'fa fa-square-o', command: 'insert-custom', + attributes : { title : 'Create all-width box' }, + options: { + content : { style: { width: '100%', 'min-height': '75px'}}, + terminateAfterInsert : false, + },}, + ] + }, + { id: 'remove', className: 'fa fa-trash-o', command: 'delete-comp', attributes : { title: 'Remove' }, }, + { id: 'move', className: 'fa fa-arrows', command: 'move-comp', attributes : { title: 'Move' }, }, + { id: 'resize', className: 'fa fa-arrows-alt', command: 'resize-comp', attributes : { title: 'Resize' }, }, + { id: 'text', className: 'fa fa-font' , command: 'text-comp', attributes : { title: 'Text' }, }, + { id: 'image', className: 'fa fa-picture-o', command: 'image-comp', attributes : { title: 'Image' }, }, + { id: 'var', className: 'fa fa-hashtag', command: 'insert-custom',attributes : { title: 'Some variable' }, + options: { content: '{{ VAR11 }}', terminateAfterInsert: true, }, + }, + ], + },{ + id : 'options', + buttons : [ + { id: 'visibility', className: 'fa fa-eye', command: 'sw-visibility', active: true, context: 'sw-visibility', attributes: { title: 'View components' }, }, + { id: 'export', className: 'fa fa-code', command: 'export-template', attributes: { title: 'View code' }, }, + ], + },{ + id : 'views', + buttons : [{ id: 'open-sm', className: 'fa fa-paint-brush', command: 'open-sm', active: true, attributes: { title: 'Open Style Manager' },}, + { id: 'open-layers', className: 'fa fa-bars', command: 'open-layers', attributes : { title: 'Open Layer Manager' }, },], + }], + }, + + styleManager : { + sectors: [{ + name: 'General', + properties:[{ + name : 'Alignament', + property : 'float', + type : 'radio', + defaults : 'none', + list : [{ + value : 'none', + title : 'None', + className : 'fa fa-times', + },{ + value : 'left', + className : 'fa fa-align-left', + title : 'Float element to the left', + },{ + value : 'right', + className : 'fa fa-align-right', + title : 'Float element to the right', + }], + },{ + name : 'Display', + property : 'display', + type : 'radio', + defaults : 'block', + list : [{ + value : 'block', + title : 'Block', + },{ + value : 'inline', + title : 'Inline', + },{ + value : 'inline-block', + title : 'Inline-block', + },{ + value : 'none', + title : 'None', + className : 'fa fa-eye-slash', + }], + },{ + name : 'Position', + property : 'position', + type : 'radio', + defaults : 'static', + list : [{ + value : 'static', + title : 'Static', + },{ + value : 'relative', + title : 'Relative', + },{ + value : 'absolute', + title : 'Absolute', + },{ + value : 'fixed', + title : 'fixed', + }], + },{ + name : 'Top', + property : 'top', + type : 'integer', + units : ['px','%'], + defaults : '0', + },{ + name : 'Right', + property : 'right', + type : 'integer', + units : ['px','%'], + defaults : '0', + },{ + name : 'Left', + property : 'left', + type : 'integer', + units : ['px','%'], + defaults : '0', + },{ + name : 'Bottom', + property : 'bottom', + type : 'integer', + units : ['px','%'], + defaults : '0', + }], + },{ + name: 'Dimension', + properties:[{ + name : 'Width', + property : 'width', + type : 'integer', + units : ['px','%'], + defaults : 'auto', + min : 0, + },{ + name : 'Height', + property : 'height', + type : 'integer', + units : ['px','%'], + defaults : 'auto', + min : 0, + },{ + name : 'Max width', + property : 'max-width', + type : 'integer', + units : ['px','%'], + defaults : 'auto', + min : 0, + },{ + name : 'Min height', + property : 'min-height', + type : 'integer', + units : ['px','%'], + defaults : 'auto', + min : 0, + },{ + name : 'Padding', + property : 'padding', + type : 'composite', + properties:[{ + name : 'Top', + property : 'mpadding-top', + type : 'integer', + units : ['px','%'], + defaults : 0, + min : 0, + },{ + name : 'Right', + property : 'margin-right', + type : 'integer', + units : ['px','%'], + defaults : 0, + min : 0, + },{ + name : 'Bottom', + property : 'margin-bottom', + type : 'integer', + units : ['px','%'], + defaults : 0, + min : 0, + },{ + name : 'Left', + property : 'margin-Left', + type : 'integer', + units : ['px','%'], + defaults : 0, + min : 0, + },], + },], + },{ + name: 'Typography', + properties:[{ + name : 'Font', + property : 'font-family', + type : 'select', + defaults : 'Arial, Helvetica, sans-serif', + list : [{ + value : 'Arial, Helvetica, sans-serif', + name : 'Arial', + style : 'font-family: Arial, Helvetica, sans-serif', + },{ + value : '"Arial Black", Gadget, sans-serif', + style : 'font-family: "Arial Black", Gadget, sans-serif', + name : 'Arial Black', + },{ + value : '"Brush Script MT", sans-serif', + style : 'font-family: "Brush Script MT", sans-serif', + name : 'Brush Script MT', + },{ + value : '"Comic Sans MS", cursive, sans-serif', + style : 'font-family: "Comic Sans MS", cursive, sans-serif', + name : 'Comica Sans', + },{ + value : '"Courier New", Courier, monospace', + style : 'font-family: "Courier New", Courier, monospace', + name : 'Courier New', + },{ + value : 'Georgia, serif', + style : 'font-family: Georgia, serif', + name : 'Georgia', + },{ + value : 'Helvetica, serif', + style : 'font-family: Helvetica, serif', + name : 'Helvetica', + },{ + value : 'Impact, Charcoal, sans-serif', + style : 'font-family: Impact, Charcoal, sans-serif', + name : 'Impact', + },{ + value : '"Lucida Sans Unicode", "Lucida Grande", sans-serif', + style : 'font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif', + name : 'Lucida Sans', + },{ + value : 'Tahoma, Geneva, sans-serif', + style : 'font-family: Tahoma, Geneva, sans-serif', + name : 'Tahoma', + },{ + value : '"Times New Roman", Times, serif', + style : 'font-family: "Times New Roman", Times, serif', + name : 'Times New Roman', + },{ + value : '"Trebuchet MS", Helvetica, sans-serif', + style : 'font-family: "Trebuchet MS", Helvetica, sans-serif', + name : 'Trebuchet', + },{ + value : 'Verdana, Geneva, sans-serif', + style : 'font-family: Verdana, Geneva, sans-serif', + name : 'Verdana', + }], + },{ + name : 'Font size', + property : 'font-size', + type : 'integer', + units : ['px','em'], + defaults : '12', + min : 0, + },{ + name : 'Weight', + property : 'font-weight', + type : 'select', + defaults : '400', + list: [{ value : '100', name : 'Thin', }, + { value : '200', name : 'Extra-Light', }, + { value : '300', name : 'Light', }, + { value : '400', name : 'Normal', }, + { value : '500', name : 'Medium',}, + { value : '600', name : 'Semi-Bold',}, + { value : '700', name : 'Bold', }, + { value : '800', name : 'Extra-Bold',}, + { value : '900', name : 'Ultra-Bold', }], + },{ + name : 'Letter spacing', + property : 'letter-spacing', + type : 'integer', + units : ['px'], + defaults : 'normal', + },{ + name: 'Font color', + property: 'color', + type: 'color', + defaults: 'black', + },{ + name : 'Line height', + property : 'line-height', + type : 'integer', + units : ['px'], + defaults : 'normal', + },{ + name : 'Text align', + property : 'text-align', + type : 'radio', + defaults : 'left', + list : [{ value : 'left', name : 'Left', className: 'fa fa-align-left'}, + { value : 'center', name : 'Center', className: 'fa fa-align-center' }, + { value : 'right', name : 'Right', className: 'fa fa-align-right'}, + { value : 'justify', name : 'Justify', className: 'fa fa-align-justify'},], + }], + },{ + name: 'Decorations', + properties: [{ + name : 'Borders radius', + property : 'border-radius', + type : 'integer', + units : ['px'], + defaults : '0', + min : 0, + },{ + name : 'Borders radius', + property : 'border-radius', + type : 'composite', + properties : [{ + name : 'Top', + property : 'b-top', + type : 'integer', + units : ['px','%'], + defaults : 0, + min : 0, + },{ + name : 'Right', + property : 'b-right', + type : 'integer', + units : ['px','%'], + min : 0, + defaults : 0, + },{ + name : 'Bottom', + property : 'b-bot', + type : 'integer', + units : ['px','%'], + min : 0, + defaults : 0, + },{ + name : 'Left', + property : 'b-left', + type : 'integer', + units : ['px'], + min : 0, + defaults : 0, + },], + },{ + name : 'Border', + property : 'border', + type : 'composite', + properties : [{ + name : 'Width', + property : 'br-width', + type : 'integer', + units : ['px','em'], + defaults : 0, + min : 0, + },{ + name : 'Style', + property : 'br-style', + type : 'select', + defaults : 'solid', + list: [{ value : 'none', name : 'None', }, + { value : 'solid', name : 'Solid', }, + { value : 'dashed', name : 'Dashed', }, + { value : 'dotted', name : 'Dotted', },], + },{ + name: 'Color', + property: 'color', + type: 'color', + defaults: 'black', + }], + },{ + name : 'Box shadow', + property : 'box-shadow', + type : 'stack', + preview : true, + properties : [{ + name: 'Shadow type', + property: 'shadow-type', + type: 'select', + defaults: '', + list: [ { value : '', name : 'Outside', }, + { value : 'inset', name : 'Inside', }], + },{ + name: 'X position', + property: 'shadow-x', + type: 'integer', + units: ['px','%'], + defaults : 0, + },{ + name: 'Y position', + property: 'shadow-y', + type: 'integer', + units: ['px','%'], + defaults : 0, + },{ + name: 'Blur', + property: 'shadow-blur', + type: 'integer', + units: ['px'], + defaults : 5, + min: 0, + },{ + name: 'Spread', + property: 'shadow-spread', + type: 'integer', + units: ['px'], + defaults : 0, + },{ + name: 'Color', + property: 'shadow-color', + type: 'color', + defaults: 'black', + },], + },{ + name : 'Background', + property : 'background', + type : 'stack', + preview : true, + properties : [{ + name: 'Image', + property: 'background-image', + type: 'file', + defaults: 'none', + }, + { + name: 'Repeat', + property: 'background-repeat', + type: 'select', + defaults: 'repeat', + list: [{ value : 'repeat', name : 'Repeat', }, + { value : 'repeat-x', name : 'Repeat X', }, + { value : 'repeat-y', name : 'Repeat Y', }, + { value : 'no-repeat', name : 'No repeat', }], + }, + { + name: 'Position X', + property: 'background-position', + type: 'select', + defaults: 'left', + list: [ { value : 'left', name : 'Left', }, + { value : 'center', name : 'Center', }, + { value : 'right', name : 'Right', }], + },{ + name: 'Position Y', + property: 'background-position', + type: 'select', + defaults: 'top', + list: [ { value : 'top', name : 'Top', }, + { value : 'center', name : 'Center', }, + { value : 'bottom', name : 'Bottom', }], + },{ + name: 'Attach', + property: 'background-attachment', + type: 'select', + defaults: 'scroll', + list: [{ value : 'scroll', name : 'Scroll', }, + { value : 'fixed', name : 'Fixed', }, + { value : 'local', name : 'Local', }], + },], + },], + },{ + name: 'Extra', + properties: [{ + name: 'Transition', + property: 'transition', + type: 'stack', + preview: false, + properties:[{ + name: 'Property', + property: 'transition-property', + type: 'select', + defaults: '', + list: [{ value : 'width', name : 'Width', }, + { value : 'height', name : 'Height', }, + { value : 'background-color', name : 'Background', }], + },{ + name: 'Duration', + property: 'transition-duration', + type: 'integer', + units: ['s'], + defaults : '2', + min: 0, + },{ + name: 'Easing', + property: 'transition-timing-function', + type: 'select', + defaults: 'ease', + list: [{ value : 'linear', name : 'Linear', }, + { value : 'ease', name : 'Ease', }, + { value : 'ease-in', name : 'Ease-in', }, + { value : 'ease-out', name : 'Ease-out', }, + { value : 'ease-in-out', name : 'Ease-in-out', }], + }], + },{ + name: 'Perspective', + property: 'perspective', + type: 'integer', + units: ['px'], + defaults : '0', + min: 0, + },{ + name: 'Transform', + property: 'transform', + type: 'composite', + properties:[{ + name: 'Rotate X', + property: 'transform-rotate-x', + type: 'integer', + units: ['deg'], + defaults : '0', + functionName: 'rotateX', + },{ + name: 'Rotate Y', + property: 'transform-rotate-y', + type: 'integer', + units: ['deg'], + defaults : '0', + functionName: 'rotateY', + },{ + name: 'Rotate Z', + property: 'transform-rotate-z', + type: 'integer', + units: ['deg'], + defaults : '0', + functionName: 'rotateZ', + }], + }] + } + ], + + }, + }); + + grapes.render(); + + }); +}); + diff --git a/bundle/dom_components/config/config.js b/src/dom_components/config/config.js similarity index 54% rename from bundle/dom_components/config/config.js rename to src/dom_components/config/config.js index 95a227750..3a532abf3 100644 --- a/bundle/dom_components/config/config.js +++ b/src/dom_components/config/config.js @@ -4,13 +4,21 @@ define(function () { wrapperId : 'wrapper', - component : {}, + // Default wrapper configuration + wrapper : { + removable : false, + stylable : ['background','background-color','background-image', 'background-repeat','background-attachment','background-position'], + movable : false, + badgable : false, + }, // Could be used for default components components : {}, rte : {}, + em : {}, + // Class for new image component imageCompClass : 'fa fa-picture-o', diff --git a/bundle/dom_components/main.js b/src/dom_components/main.js similarity index 80% rename from bundle/dom_components/main.js rename to src/dom_components/main.js index 9d2cfaf01..81ab978ed 100644 --- a/bundle/dom_components/main.js +++ b/src/dom_components/main.js @@ -22,7 +22,15 @@ define(function(require) { c[name] = defaults[name]; } - this.component = new Component(c.component); + if(!c.wrapper.attributes) + c.wrapper.attributes = {}; + c.wrapper.attributes.id = 'wrapper'; + + if(!c.wrapper.style) + c.wrapper.style = {}; + c.wrapper.style.position = 'relative'; + + this.component = new Component(c.wrapper); var obj = { model : this.component, config : c, diff --git a/bundle/dom_components/model/Component.js b/src/dom_components/model/Component.js similarity index 97% rename from bundle/dom_components/model/Component.js rename to src/dom_components/model/Component.js index a89e09062..9ca49f802 100644 --- a/bundle/dom_components/model/Component.js +++ b/src/dom_components/model/Component.js @@ -13,6 +13,7 @@ define(['backbone','./Components'], movable : true, droppable : true, badgable : true, + stylable : true, status : '', previousModel : '', content : '', diff --git a/bundle/dom_components/model/ComponentImage.js b/src/dom_components/model/ComponentImage.js similarity index 100% rename from bundle/dom_components/model/ComponentImage.js rename to src/dom_components/model/ComponentImage.js diff --git a/bundle/dom_components/model/ComponentText.js b/src/dom_components/model/ComponentText.js similarity index 100% rename from bundle/dom_components/model/ComponentText.js rename to src/dom_components/model/ComponentText.js diff --git a/bundle/dom_components/model/Components.js b/src/dom_components/model/Components.js similarity index 100% rename from bundle/dom_components/model/Components.js rename to src/dom_components/model/Components.js diff --git a/bundle/dom_components/view/ComponentImageView.js b/src/dom_components/view/ComponentImageView.js similarity index 100% rename from bundle/dom_components/view/ComponentImageView.js rename to src/dom_components/view/ComponentImageView.js diff --git a/bundle/dom_components/view/ComponentTextView.js b/src/dom_components/view/ComponentTextView.js similarity index 92% rename from bundle/dom_components/view/ComponentTextView.js rename to src/dom_components/view/ComponentTextView.js index 67a6d8410..44b1d0af5 100644 --- a/bundle/dom_components/view/ComponentTextView.js +++ b/src/dom_components/view/ComponentTextView.js @@ -26,8 +26,9 @@ define(['backbone', './ComponentView'], * */ enableEditing: function(e){ if(this.rte){ - if(!this.$wrapper) - this.$wrapper = $('#'+this.config.wrapperId); + var $e = this.config.em.get('$editor'); + if(!this.$wrapper && $e.length) + this.$wrapper = $e.find('#'+this.config.wrapperId); this.rte.bind(this, this.$wrapper); } $(document).on('mousedown', this.disableEditing); //Close edit mode diff --git a/bundle/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js similarity index 69% rename from bundle/dom_components/view/ComponentView.js rename to src/dom_components/view/ComponentView.js index 7c2eb6088..a32261df9 100644 --- a/bundle/dom_components/view/ComponentView.js +++ b/src/dom_components/view/ComponentView.js @@ -117,36 +117,5 @@ define(['backbone', './ComponentsView'], return this; }, - /** TODO DELETE - * Add new component to canvas - * @param Object Component added - * @param Object Collection - * @param Object Parameters - * - addComponent: function (component, collection, params) { - var viewObject = require('componentView'); //Set default view - if(component.get('editable')) //If editable component, change view - viewObject = require('componentTextView'); //Change view in case is editable - if(component.get('src')){ //If editable component, change view - viewObject = require('componentImageView'); //Change view in case is editable - } - var view = new viewObject({ - model: component, - editorModel: this.editorModel, - }); - if(params && (typeof params.at!='undefined') ){ //If i have index position change the way to append - if (params.at === 0){ - this.$el.prepend(view.render().el); - }else{ - this.$el.children().filter(function(){ - return !$(this).data('helper'); - }).eq(params.at-1).after(view.render().el); - //console.log("insert at "+params.at+" children: "+this.$el.children().filter(function() { return !$(this).data('helper');}).length); - } - }else - this.$el.append(view.render().el); - }, - */ - }); }); diff --git a/bundle/dom_components/view/ComponentsView.js b/src/dom_components/view/ComponentsView.js similarity index 100% rename from bundle/dom_components/view/ComponentsView.js rename to src/dom_components/view/ComponentsView.js diff --git a/bundle/editor/config/config.js b/src/editor/config/config.js similarity index 95% rename from bundle/editor/config/config.js rename to src/editor/config/config.js index 61e520f9d..0be30080a 100644 --- a/bundle/editor/config/config.js +++ b/src/editor/config/config.js @@ -8,9 +8,10 @@ define(function () { storagePrefix: 'wte-', // Editor ID. Useful in case of multiple editors on the same page - id: '', + id : '', - appContainer : '#wte-app', + // Where render the editor + container : '', idCanvas : 'canvas', diff --git a/bundle/editor/main.js b/src/editor/main.js similarity index 100% rename from bundle/editor/main.js rename to src/editor/main.js diff --git a/bundle/editor/model/Editor.js b/src/editor/model/Editor.js similarity index 91% rename from bundle/editor/model/Editor.js rename to src/editor/model/Editor.js index bd8c3f6ab..8687c1d63 100644 --- a/bundle/editor/model/Editor.js +++ b/src/editor/model/Editor.js @@ -10,7 +10,7 @@ define([ 'Canvas', 'RichTextEditor', 'DomComponents', - 'Panel'], + 'Panels'], function( Backbone, UndoManager, @@ -35,7 +35,7 @@ define([ initialize: function(c) { this.config = c; - this.compName = this.config.storagePrefix + 'componentsTree' + this.config.id; + this.compName = this.config.storagePrefix + 'components' + this.config.id; this.set('Config', c); this.initStorage(); @@ -58,22 +58,12 @@ define([ initComponents: function() { var cfg = this.config.components, - comps = this.loadComponentsTree(), + comp = this.loadComponentsTree(), cmpStylePfx = cfg.stylePrefix || 'comp-'; - if(!comps){ - comps = { - removable : false, - movable : false, - badgable : false, - attributes : { id: this.config.idWrapper }, - style : { position: 'relative',}, - components : cfg.components, - }; - } - cfg.stylePrefix = this.config.stylePrefix + cmpStylePfx; - cfg.component = comps; + if(comp) + cfg.wrapper = comp; if(this.rte) cfg.rte = this.rte; @@ -83,7 +73,9 @@ define([ if(this.am) cfg.am = this.am; - + + cfg.em = this; + this.cmp = new DomComponents(cfg); if(this.stm.isAutosave()){ // TODO Currently doesn't listen already created models @@ -101,6 +93,7 @@ define([ var cfg = this.config.canvas, pfx = cfg.stylePrefix || 'cv-'; cfg.stylePrefix = this.config.stylePrefix + pfx; + cfg.canvasId = this.config.idCanvas; this.cv = new Canvas(this.config.canvas); if(this.cmp) @@ -303,7 +296,6 @@ define([ var wrp = this.cmp.getComponent(); if(wrp && this.cm){ var res = this.cm.getCode(wrp, 'json'); - console.log(res); this.stm.store(this.compName, JSON.stringify(res)); } }, @@ -321,9 +313,9 @@ define([ // Call stopListening for not creating nested listenings this.stopListening(comps, 'add', this.updateComponents); - this.stopListening(comps, 'remove', this.componentsUpdated); + this.stopListening(comps, 'remove', this.rmComponents); this.listenTo(comps, 'add', this.updateComponents); - this.listenTo(comps, 'remove', this.componentsUpdated); + this.listenTo(comps, 'remove', this.rmComponents); this.stopListening(model, 'change:style change:content', this.updateComponents); this.listenTo(model, 'change:style change:content', this.updateComponents); @@ -332,5 +324,19 @@ define([ this.componentsUpdated(); }, + /** + * Triggered when some component is removed updated + * @param {Object} model + * @param {Mixed} val Value + * @param {Object} opt Options + * + * */ + rmComponents: function(model, val, opt){ + var avSt = opt ? opt.avoidStore : 0; + + if(!avSt) + this.componentsUpdated(); + } + }); }); diff --git a/bundle/editor/view/EditorView.js b/src/editor/view/EditorView.js similarity index 80% rename from bundle/editor/view/EditorView.js rename to src/editor/view/EditorView.js index a1ae33966..b2d9b153a 100644 --- a/bundle/editor/view/EditorView.js +++ b/src/editor/view/EditorView.js @@ -14,6 +14,10 @@ function(Backbone){ render: function(){ this.$el.empty(); + this.$cont = $('body ' + this.model.config.container); + + this.model.set('$editor', this.$el); + if(this.cv) this.$el.append(this.cv.render()); @@ -22,7 +26,7 @@ function(Backbone){ this.$el.attr('class', this.className); - $('body '+this.model.config.appContainer).html(this.$el); + this.$cont.html(this.$el); if(this.pn) this.pn.active(); diff --git a/bundle/main.js b/src/main.js similarity index 99% rename from bundle/main.js rename to src/main.js index 20fdbc0c8..762ccf0c6 100644 --- a/bundle/main.js +++ b/src/main.js @@ -1,5 +1,5 @@ -require(['bundle/config/require-config.js'], function() { +require(['src/config/require-config.js'], function() { require(['editor/main'],function (Grapes){ return Grapes; diff --git a/bundle/modal_dialog/config/config.js b/src/modal_dialog/config/config.js similarity index 100% rename from bundle/modal_dialog/config/config.js rename to src/modal_dialog/config/config.js diff --git a/bundle/modal_dialog/main.js b/src/modal_dialog/main.js similarity index 100% rename from bundle/modal_dialog/main.js rename to src/modal_dialog/main.js diff --git a/bundle/modal_dialog/model/Modal.js b/src/modal_dialog/model/Modal.js similarity index 100% rename from bundle/modal_dialog/model/Modal.js rename to src/modal_dialog/model/Modal.js diff --git a/bundle/modal_dialog/template/modal.html b/src/modal_dialog/template/modal.html similarity index 100% rename from bundle/modal_dialog/template/modal.html rename to src/modal_dialog/template/modal.html diff --git a/bundle/modal_dialog/view/ModalView.js b/src/modal_dialog/view/ModalView.js similarity index 98% rename from bundle/modal_dialog/view/ModalView.js rename to src/modal_dialog/view/ModalView.js index df9c3eead..d1ad532d1 100644 --- a/bundle/modal_dialog/view/ModalView.js +++ b/src/modal_dialog/view/ModalView.js @@ -102,7 +102,6 @@ define(['backbone', 'text!./../template/modal.html'], this.$el.attr('class', this.pfx + 'container'); this.updateOpen(); - console.log('Modal rendered'); return this; }, diff --git a/bundle/navigator/config/config.js b/src/navigator/config/config.js similarity index 100% rename from bundle/navigator/config/config.js rename to src/navigator/config/config.js diff --git a/bundle/navigator/main.js b/src/navigator/main.js similarity index 100% rename from bundle/navigator/main.js rename to src/navigator/main.js diff --git a/bundle/navigator/template/item.html b/src/navigator/template/item.html similarity index 100% rename from bundle/navigator/template/item.html rename to src/navigator/template/item.html diff --git a/bundle/navigator/view/ItemSort.js b/src/navigator/view/ItemSort.js similarity index 100% rename from bundle/navigator/view/ItemSort.js rename to src/navigator/view/ItemSort.js diff --git a/bundle/navigator/view/ItemView.js b/src/navigator/view/ItemView.js similarity index 100% rename from bundle/navigator/view/ItemView.js rename to src/navigator/view/ItemView.js diff --git a/bundle/navigator/view/ItemsView.js b/src/navigator/view/ItemsView.js similarity index 100% rename from bundle/navigator/view/ItemsView.js rename to src/navigator/view/ItemsView.js diff --git a/src/panels/config/config.js b/src/panels/config/config.js new file mode 100644 index 000000000..1131f7f82 --- /dev/null +++ b/src/panels/config/config.js @@ -0,0 +1,14 @@ +define(function () { + return { + stylePrefix : 'pn-', + + // Default panels + defaults : [], + + // Editor model + em : null, + + // Delay before show children buttons (in milliseconds) + delayBtnsShow : 300, + }; +}); \ No newline at end of file diff --git a/bundle/panel/main.js b/src/panels/main.js similarity index 100% rename from bundle/panel/main.js rename to src/panels/main.js diff --git a/bundle/panel/model/Button.js b/src/panels/model/Button.js similarity index 100% rename from bundle/panel/model/Button.js rename to src/panels/model/Button.js diff --git a/bundle/panel/model/Buttons.js b/src/panels/model/Buttons.js similarity index 100% rename from bundle/panel/model/Buttons.js rename to src/panels/model/Buttons.js diff --git a/bundle/panel/model/Panel.js b/src/panels/model/Panel.js similarity index 100% rename from bundle/panel/model/Panel.js rename to src/panels/model/Panel.js diff --git a/bundle/panel/model/Panels.js b/src/panels/model/Panels.js similarity index 100% rename from bundle/panel/model/Panels.js rename to src/panels/model/Panels.js diff --git a/bundle/panel/view/ButtonView.js b/src/panels/view/ButtonView.js similarity index 98% rename from bundle/panel/view/ButtonView.js rename to src/panels/view/ButtonView.js index ecb0d79cf..11816bc09 100644 --- a/bundle/panel/view/ButtonView.js +++ b/src/panels/view/ButtonView.js @@ -144,8 +144,6 @@ function(Backbone, require) { command = this.commands.get(this.model.get('command')); if(this.model.get('active')){ - //this.$el.addClass(this.activeCls); - //this.model.collection.deactivateAllExceptOne(this.model); this.model.collection.deactivateAll(this.model.get('context')); this.model.set('active', true, { silent: true }).trigger('checkActive'); diff --git a/bundle/panel/view/ButtonsView.js b/src/panels/view/ButtonsView.js similarity index 100% rename from bundle/panel/view/ButtonsView.js rename to src/panels/view/ButtonsView.js diff --git a/bundle/panel/view/PanelView.js b/src/panels/view/PanelView.js similarity index 100% rename from bundle/panel/view/PanelView.js rename to src/panels/view/PanelView.js diff --git a/bundle/panel/view/PanelsView.js b/src/panels/view/PanelsView.js similarity index 100% rename from bundle/panel/view/PanelsView.js rename to src/panels/view/PanelsView.js diff --git a/bundle/rich_text_editor/config/config.js b/src/rich_text_editor/config/config.js similarity index 100% rename from bundle/rich_text_editor/config/config.js rename to src/rich_text_editor/config/config.js diff --git a/bundle/rich_text_editor/main.js b/src/rich_text_editor/main.js similarity index 100% rename from bundle/rich_text_editor/main.js rename to src/rich_text_editor/main.js diff --git a/bundle/rich_text_editor/model/CommandButton.js b/src/rich_text_editor/model/CommandButton.js similarity index 100% rename from bundle/rich_text_editor/model/CommandButton.js rename to src/rich_text_editor/model/CommandButton.js diff --git a/bundle/rich_text_editor/model/CommandButtons.js b/src/rich_text_editor/model/CommandButtons.js similarity index 100% rename from bundle/rich_text_editor/model/CommandButtons.js rename to src/rich_text_editor/model/CommandButtons.js diff --git a/bundle/rich_text_editor/view/CommandButtonView.js b/src/rich_text_editor/view/CommandButtonView.js similarity index 100% rename from bundle/rich_text_editor/view/CommandButtonView.js rename to src/rich_text_editor/view/CommandButtonView.js diff --git a/bundle/rich_text_editor/view/CommandButtonsView.js b/src/rich_text_editor/view/CommandButtonsView.js similarity index 100% rename from bundle/rich_text_editor/view/CommandButtonsView.js rename to src/rich_text_editor/view/CommandButtonsView.js diff --git a/bundle/storage_manager/config/config.js b/src/storage_manager/config/config.js similarity index 100% rename from bundle/storage_manager/config/config.js rename to src/storage_manager/config/config.js diff --git a/bundle/storage_manager/main.js b/src/storage_manager/main.js similarity index 100% rename from bundle/storage_manager/main.js rename to src/storage_manager/main.js diff --git a/bundle/storage_manager/model/LocalStorage.js b/src/storage_manager/model/LocalStorage.js similarity index 100% rename from bundle/storage_manager/model/LocalStorage.js rename to src/storage_manager/model/LocalStorage.js diff --git a/bundle/storage_manager/model/RemoteStorage.js b/src/storage_manager/model/RemoteStorage.js similarity index 100% rename from bundle/storage_manager/model/RemoteStorage.js rename to src/storage_manager/model/RemoteStorage.js diff --git a/bundle/storage_manager/model/StorageInterface.js b/src/storage_manager/model/StorageInterface.js similarity index 100% rename from bundle/storage_manager/model/StorageInterface.js rename to src/storage_manager/model/StorageInterface.js diff --git a/src/style_manager/config/config.js b/src/style_manager/config/config.js new file mode 100644 index 000000000..d17c2c865 --- /dev/null +++ b/src/style_manager/config/config.js @@ -0,0 +1,11 @@ +define(function () { + return { + + stylePrefix : 'sm-', + + target : null, + + sectors : [], + + }; +}); \ No newline at end of file diff --git a/bundle/style_manager/main.js b/src/style_manager/main.js similarity index 100% rename from bundle/style_manager/main.js rename to src/style_manager/main.js diff --git a/bundle/style_manager/model/Layer.js b/src/style_manager/model/Layer.js similarity index 100% rename from bundle/style_manager/model/Layer.js rename to src/style_manager/model/Layer.js diff --git a/bundle/style_manager/model/Layers.js b/src/style_manager/model/Layers.js similarity index 100% rename from bundle/style_manager/model/Layers.js rename to src/style_manager/model/Layers.js diff --git a/bundle/style_manager/model/Properties.js b/src/style_manager/model/Properties.js similarity index 100% rename from bundle/style_manager/model/Properties.js rename to src/style_manager/model/Properties.js diff --git a/bundle/style_manager/model/Property.js b/src/style_manager/model/Property.js similarity index 100% rename from bundle/style_manager/model/Property.js rename to src/style_manager/model/Property.js diff --git a/bundle/style_manager/model/Sector.js b/src/style_manager/model/Sector.js similarity index 100% rename from bundle/style_manager/model/Sector.js rename to src/style_manager/model/Sector.js diff --git a/bundle/style_manager/model/Sectors.js b/src/style_manager/model/Sectors.js similarity index 100% rename from bundle/style_manager/model/Sectors.js rename to src/style_manager/model/Sectors.js diff --git a/bundle/style_manager/templates/layer.html b/src/style_manager/templates/layer.html similarity index 100% rename from bundle/style_manager/templates/layer.html rename to src/style_manager/templates/layer.html diff --git a/bundle/style_manager/templates/propertyColor.html b/src/style_manager/templates/propertyColor.html similarity index 100% rename from bundle/style_manager/templates/propertyColor.html rename to src/style_manager/templates/propertyColor.html diff --git a/bundle/style_manager/templates/propertyComposite.html b/src/style_manager/templates/propertyComposite.html similarity index 100% rename from bundle/style_manager/templates/propertyComposite.html rename to src/style_manager/templates/propertyComposite.html diff --git a/bundle/style_manager/templates/propertyFile.html b/src/style_manager/templates/propertyFile.html similarity index 100% rename from bundle/style_manager/templates/propertyFile.html rename to src/style_manager/templates/propertyFile.html diff --git a/bundle/style_manager/templates/propertyInteger.html b/src/style_manager/templates/propertyInteger.html similarity index 100% rename from bundle/style_manager/templates/propertyInteger.html rename to src/style_manager/templates/propertyInteger.html diff --git a/bundle/style_manager/templates/propertyLabel.html b/src/style_manager/templates/propertyLabel.html similarity index 100% rename from bundle/style_manager/templates/propertyLabel.html rename to src/style_manager/templates/propertyLabel.html diff --git a/bundle/style_manager/templates/propertyRadio.html b/src/style_manager/templates/propertyRadio.html similarity index 100% rename from bundle/style_manager/templates/propertyRadio.html rename to src/style_manager/templates/propertyRadio.html diff --git a/bundle/style_manager/templates/propertySelect.html b/src/style_manager/templates/propertySelect.html similarity index 100% rename from bundle/style_manager/templates/propertySelect.html rename to src/style_manager/templates/propertySelect.html diff --git a/bundle/style_manager/templates/propertyStack.html b/src/style_manager/templates/propertyStack.html similarity index 100% rename from bundle/style_manager/templates/propertyStack.html rename to src/style_manager/templates/propertyStack.html diff --git a/bundle/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js similarity index 100% rename from bundle/style_manager/view/LayerView.js rename to src/style_manager/view/LayerView.js diff --git a/bundle/style_manager/view/LayersView.js b/src/style_manager/view/LayersView.js similarity index 100% rename from bundle/style_manager/view/LayersView.js rename to src/style_manager/view/LayersView.js diff --git a/bundle/style_manager/view/PropertiesView.js b/src/style_manager/view/PropertiesView.js similarity index 100% rename from bundle/style_manager/view/PropertiesView.js rename to src/style_manager/view/PropertiesView.js diff --git a/bundle/style_manager/view/PropertyColorView.js b/src/style_manager/view/PropertyColorView.js similarity index 100% rename from bundle/style_manager/view/PropertyColorView.js rename to src/style_manager/view/PropertyColorView.js diff --git a/bundle/style_manager/view/PropertyCompositeView.js b/src/style_manager/view/PropertyCompositeView.js similarity index 100% rename from bundle/style_manager/view/PropertyCompositeView.js rename to src/style_manager/view/PropertyCompositeView.js diff --git a/bundle/style_manager/view/PropertyFileView.js b/src/style_manager/view/PropertyFileView.js similarity index 100% rename from bundle/style_manager/view/PropertyFileView.js rename to src/style_manager/view/PropertyFileView.js diff --git a/bundle/style_manager/view/PropertyIntegerView.js b/src/style_manager/view/PropertyIntegerView.js similarity index 93% rename from bundle/style_manager/view/PropertyIntegerView.js rename to src/style_manager/view/PropertyIntegerView.js index 97e6ed770..ed89d9d5c 100644 --- a/bundle/style_manager/view/PropertyIntegerView.js +++ b/src/style_manager/view/PropertyIntegerView.js @@ -107,14 +107,14 @@ define(['backbone','./PropertyView', 'text!./../templates/propertyInteger.html'] /** @inheritdoc */ setValue: function(value){ - var u = this.unit; - var v = this.model.get('value') || this.defaultValue; + var u = this.unit, + v = this.model.get('value') || this.defaultValue; if(value){ - v = parseInt(value, 10); - v = !isNaN(v) ? v : this.defaultValue; - uN = value.replace(v,''); - if(this.units[uN]) + v = parseInt(value, 10); + v = !isNaN(v) ? v : this.defaultValue; + var uN = value.replace(v,''); + if(_.indexOf(this.units, uN) > -1) u = uN; } diff --git a/bundle/style_manager/view/PropertyRadioView.js b/src/style_manager/view/PropertyRadioView.js similarity index 86% rename from bundle/style_manager/view/PropertyRadioView.js rename to src/style_manager/view/PropertyRadioView.js index cdaada00d..b85e63f65 100644 --- a/bundle/style_manager/view/PropertyRadioView.js +++ b/src/style_manager/view/PropertyRadioView.js @@ -19,12 +19,12 @@ define(['backbone','./PropertyView', 'text!./../templates/propertyRadio.html'], if(this.list && this.list.length){ this.input = ''; _.each(this.list,function(el){ - var icon = el.icon ? el.icon+' '+ pfx + 'icon' : '', - title = el.info ? el.info : '', + var cl = el.className ? el.className+' '+ pfx + 'icon' : '', + title = el.title ? el.title : '', id = this.property+'-'+el.value; this.input += '
'+ ''+ - '
'; + '
'; },this); this.$input = $(this.input); this.$el.find('#'+ pfx +'input-holder').html(this.$input); diff --git a/bundle/style_manager/view/PropertySelectView.js b/src/style_manager/view/PropertySelectView.js similarity index 100% rename from bundle/style_manager/view/PropertySelectView.js rename to src/style_manager/view/PropertySelectView.js diff --git a/bundle/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js similarity index 100% rename from bundle/style_manager/view/PropertyStackView.js rename to src/style_manager/view/PropertyStackView.js diff --git a/bundle/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js similarity index 96% rename from bundle/style_manager/view/PropertyView.js rename to src/style_manager/view/PropertyView.js index d9dbdf41c..03d7418b9 100644 --- a/bundle/style_manager/view/PropertyView.js +++ b/src/style_manager/view/PropertyView.js @@ -121,6 +121,11 @@ define(['backbone', 'text!./../templates/propertyLabel.html'], valueChanged: function(e, val, opt){ if(!this.selectedComponent) return; + + // Check if component is allowed to be styled + var stylable = this.selectedComponent.get('stylable'); + if( (stylable instanceof Array && _.indexOf(stylable, this.property) < 0) || !stylable ) + return; var v = e && e.currentTarget ? this.$input.val() : this.model.get('value'), value = v + (this.$unit ? this.$unit.val() : ''), avSt = opt ? opt.avoidStore : 0; diff --git a/bundle/style_manager/view/SectorView.js b/src/style_manager/view/SectorView.js similarity index 100% rename from bundle/style_manager/view/SectorView.js rename to src/style_manager/view/SectorView.js diff --git a/bundle/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js similarity index 100% rename from bundle/style_manager/view/SectorsView.js rename to src/style_manager/view/SectorsView.js diff --git a/styles/css/main.css b/styles/css/main.css index fadbc326e..1c028ab9c 100644 --- a/styles/css/main.css +++ b/styles/css/main.css @@ -276,6 +276,7 @@ div.wte-com-hover-move { padding: 7px 5px 7px 10px; position: absolute; color: #aeaeae; + cursor: pointer; z-index: 1; } .wte-nv-navigator .wte-nv-item .wte-nv-title { font-size: 11px; @@ -466,8 +467,6 @@ div.wte-com-hover-move { height: 20px; } .wte-sm-sector .wte-sm-field.wte-sm-select option { margin: 5px 0; } - .wte-sm-sector .wte-sm-field.wte-sm-color input { - width: 50px; } .wte-sm-sector .wte-sm-field.wte-sm-composite { background-color: transparent; border: 1px solid #333333; } @@ -480,15 +479,16 @@ div.wte-com-hover-move { display: none; } .wte-sm-sector .wte-sm-field.wte-sm-list label { cursor: pointer; - padding: 5px; } + padding: 5px; + display: block; } .wte-sm-sector .wte-sm-field.wte-sm-list .wte-sm-radio:checked + label { background-color: #5b5b5b; /*5b5b5b*/ } .wte-sm-sector .wte-sm-field.wte-sm-list .wte-sm-icon { background-repeat: no-repeat; background-position: center; - color: transparent; - text-shadow: none; } + text-shadow: none; + line-height: normal; } .wte-sm-sector .wte-sm-field.wte-sm-integer select { width: auto; padding: 0; @@ -496,7 +496,6 @@ div.wte-com-hover-move { .wte-sm-sector .wte-sm-list .wte-sm-el { float: left; border-left: 1px solid #252525; - padding: 5px 0; text-shadow: 0 1px 0 #232323; /*232323*/ } .wte-sm-sector .wte-sm-list .wte-sm-el:first-child { @@ -512,7 +511,7 @@ div.wte-com-hover-move { width: 50%; margin-bottom: 5px; padding: 0 5px; } - .wte-sm-sector .wte-sm-property.wte-sm-file, .wte-sm-sector .wte-sm-property.wte-sm-composite, .wte-sm-sector .wte-sm-property.wte-sm-stack, .wte-sm-sector .wte-sm-property.wte-sm-list, .wte-sm-sector .wte-sm-property#wte-sm-background-position { + .wte-sm-sector .wte-sm-property.wte-sm-file, .wte-sm-sector .wte-sm-property.wte-sm-composite, .wte-sm-sector .wte-sm-property.wte-sm-stack, .wte-sm-sector .wte-sm-property.wte-sm-list { width: 100%; } .wte-sm-sector .wte-sm-property .wte-sm-btn { background-color: #5b5b5b; @@ -895,7 +894,7 @@ div.wte-com-hover-move { font-family: FontAwesome; } .ui-resizable-se::before { - content: "\f0b2"; } + content: "\f065"; } .ui-resizable:hover > .ui-resizable-se { opacity: 0.3; diff --git a/styles/css/main.css.map b/styles/css/main.css.map index df067d68c..f78cd33f5 100644 --- a/styles/css/main.css.map +++ b/styles/css/main.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["../scss/main.scss"], "names": [], "file": "main.css" diff --git a/styles/scss/main.scss b/styles/scss/main.scss index aa0122794..a902c4c34 100644 --- a/styles/scss/main.scss +++ b/styles/scss/main.scss @@ -318,6 +318,7 @@ $leftWidth: 16.5%; padding: 7px 5px 7px 10px; position: absolute; color: darken($fontColor,25%); + cursor:pointer; z-index: 1; } .#{$nv-prefix}item .#{$nv-prefix}title { @@ -508,7 +509,6 @@ $arrowColor: darken($fontColor,24%); /*b1b1b1*/ &.#{$sm-prefix}select{ padding:0; } &.#{$sm-prefix}select select{ height: 20px; } &.#{$sm-prefix}select option { margin: 5px 0;} - &.#{$sm-prefix}color input{ width:50px; } &.#{$sm-prefix}composite{ background-color: transparent; border: 1px solid darken($mainDkColor, 2.5%); @@ -520,15 +520,15 @@ $arrowColor: darken($fontColor,24%); /*b1b1b1*/ float:left; input{ display:none; } - label{ cursor:pointer; padding: 5px;} + label{ cursor:pointer; padding: 5px; display:block;} .#{$sm-prefix}radio:checked + label{ background-color: lighten($mainDkColor, 13%);/*5b5b5b*/ } .#{$sm-prefix}icon{ background-repeat: no-repeat; background-position:center; - color: transparent; text-shadow: none; + line-height: normal; //padding: 5px 19px; } } @@ -541,7 +541,6 @@ $arrowColor: darken($fontColor,24%); /*b1b1b1*/ .#{$sm-prefix}list .#{$sm-prefix}el{ float:left; border-left: 1px solid $darkTextShadow; - padding: 5px 0; text-shadow: 0 1px 0 darken($mainDkColor, 9%);/*232323*/ &:first-child{border:none} @@ -560,7 +559,7 @@ $arrowColor: darken($fontColor,24%); /*b1b1b1*/ margin-bottom: 5px; padding: 0 5px; - &.#{$sm-prefix}file, &.#{$sm-prefix}composite, &.#{$sm-prefix}stack, &.#{$sm-prefix}list, &##{$sm-prefix}background-position{ + &.#{$sm-prefix}file, &.#{$sm-prefix}composite, &.#{$sm-prefix}stack, &.#{$sm-prefix}list{ width:100%; } .#{$sm-prefix}btn{ @@ -972,7 +971,7 @@ $uploadPadding: 150px 10px; font-family: FontAwesome; } .ui-resizable-se::before{ - content: "\f0b2"; + content: "\f065"; } .ui-resizable:hover > .ui-resizable-se{ opacity: 0.3; filter: alpha(opacity=30); } .ui-resizable-s{ diff --git a/test/config/config.js b/test/config/config.js index 2cd8b6883..395d92459 100644 --- a/test/config/config.js +++ b/test/config/config.js @@ -1,6 +1,6 @@ require.config({ - baseUrl : "../bundle", + baseUrl : "../src", paths : { chai : '../test/libs/chai', diff --git a/test/runner/main.js b/test/runner/main.js index 2f7d1c037..23ce6b7b0 100644 --- a/test/runner/main.js +++ b/test/runner/main.js @@ -3,7 +3,7 @@ requirejs.onError = function (err) { throw err; }; -require(['../bundle/config/require-config.js', 'config/config.js'], function() { +require(['../src/config/require-config.js', 'config/config.js'], function() { require(['chai', 'specs/main.js',