Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
|\ | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Cleaning more. | Jose Antonio Marquez | 2012-06-06 |
| | | |||
| * | Cleaning up | Jose Antonio Marquez | 2012-06-06 |
| | | | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later. | ||
* | | removing all model creators. | Valerio Virgillito | 2012-06-05 |
|/ | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge branch 'refs/heads/Ninja-Internal' into Components | Jose Antonio Marquez | 2012-06-04 |
|\ | |||
| * | Merge branch 'refs/heads/master' into document-bindings-fix | Valerio Virgillito | 2012-06-01 |
| |\ | |||
| * | | cleanup items | Valerio Virgillito | 2012-05-31 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | cleanup and handling the document views in the document controller for now. | Valerio Virgillito | 2012-05-29 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Adding open draw to reel components | Jose Antonio Marquez | 2012-06-01 |
| | | | |||
* | | | Creating template mediator class | Jose Antonio Marquez | 2012-06-01 |
| |/ |/| | | | | | This is to simplify code, more to be changed and added. | ||
* | | Attempting to track clean nodes | Jose Antonio Marquez | 2012-05-30 |
|/ | | | | Need to figure out CSS overwrite issue <style> | ||
* | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | |||
* | Cleaning up | Jose Antonio Marquez | 2012-05-27 |
| | |||
* | Final clean up of render callback for design view | Jose Antonio Marquez | 2012-05-24 |
| | |||
* | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 |
|\ | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | ||
| * | Getter for _liveNodeList should return a copy. | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Removed unused variables and methods in stage-deps, layout design, and ↵ | Nivesh Rajbhandari | 2012-05-24 |
| | | | | | | | | | | | | snap-manager. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Fixed scrolling and centering stage code. Also, moved liveNodeList into the ↵ | Nivesh Rajbhandari | 2012-05-23 |
| | | | | | | | | | | | | design view and added an option to exclude styles and text nodes when retrieving the live nodes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Renaming variable as it will now be used | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | | This is no longer a temp fix, it might be a permanent boolean to open/close web-request API gates. | ||
* | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
| | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | ||
* | | Adding redirect from app folder in templates | Jose Antonio Marquez | 2012-05-22 |
|/ | | | | This doesn't resolve the issue of XHR requests made in Montage. | ||
* | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-22 |
|\ | | | | | | | | | Conflicts: js/document/document-html.js | ||
| * | fixing a few document switching issues. | Valerio Virgillito | 2012-05-22 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | - added opening multiple code and design view documents | Ananya Sen | 2012-05-21 |
| | | | | | | | | | | | | | | - switching between multiple code and design view documents - Note: closing of documents, when multiple documents are open, is not yet implemented Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | use documents parent container property | Ananya Sen | 2012-05-20 |
| | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | Merge branch 'refs/heads/master-dom-architecture' into dom-architecture | Ananya Sen | 2012-05-18 |
| |\ | |||
| * | | integrated open code view document in new dom architecture | Ananya Sen | 2012-05-18 |
| | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | | Minor bug fix | Jose Antonio Marquez | 2012-05-22 |
| | | | | | | | | | | | | No longer using webgl attribute names, instead using canvas to be more consistent and allow for better term usage across canvas 2D and RDGE. | ||
* | | | Adding support for reading webgl external files | Jose Antonio Marquez | 2012-05-22 |
| |/ |/| | | | | | For author-time, run-time is already checked in and supported. | ||
* | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-18 |
|\ \ | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| * | | Adding component initialization on open | Jose Antonio Marquez | 2012-05-17 |
| | | | | | | | | | | | | This is for opening components, selection is still not reflecting component data. | ||
* | | | fixing the color chip for the document root | Valerio Virgillito | 2012-05-18 |
|/ / | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* / | Adding default padding for banner templates. | Nivesh Rajbhandari | 2012-05-17 |
|/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Fixing preview bug | Jose Antonio Marquez | 2012-05-16 |
| | | | | Also setting up for Montage component serialization. | ||
* | Fixing overflow on open for template documents | Jose Antonio Marquez | 2012-05-15 |
| | |||
* | Finalizing open for new banner templates | Jose Antonio Marquez | 2012-05-15 |
| | | | | Moving to implement save. | ||
* | Fixing banner template | Jose Antonio Marquez | 2012-05-14 |
| | | | | Need to implement save, but this cover open and new. | ||
* | Viewport for banner templates so content doesn't push through "body". | Nivesh Rajbhandari | 2012-05-14 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | Fixing position issue | Jose Antonio Marquez | 2012-05-11 |
| | | | | Need to implement centering document. | ||
* | Fixing overflow bug for banner templates | Jose Antonio Marquez | 2012-05-11 |
| | | | | Ensuring overflow is visible but saved as hidden. | ||
* | Adding support for new templates | Jose Antonio Marquez | 2012-05-11 |
| | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template. | ||
* | Adding webRequest API | Jose Antonio Marquez | 2012-05-10 |
| | | | | Adding webRequest API to handle local URLs intercepting. Should be a temp fix. | ||
* | Adding partial close functionality | Jose Antonio Marquez | 2012-05-10 |
| | |||
* | Preliminary Montage Template Cleanup | Jose Antonio Marquez | 2012-05-09 |
| | | | | The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save. | ||
* | Adding SAVE for I/O | Jose Antonio Marquez | 2012-05-08 |
| | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up... | ||
* | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 |
| | |||
* | Moving webGL to own helper class | Jose Antonio Marquez | 2012-05-07 |
| | | | | Cleaning up webGL for better working files. | ||
* | Extracting CSS methods to parsing class. | Jose Antonio Marquez | 2012-05-07 |
| | | | | Need to do the same with webGL. | ||
* | Adding webGL support for opening files | Jose Antonio Marquez | 2012-05-07 |
| | | | | Added I/O for loading webGL on open file. I/O support for saving to come. | ||
* | Draw 3d grid by default since app model is not hooked up yet. | Nivesh Rajbhandari | 2012-05-04 |
| | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> |