aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/selection-controller.js
Commit message (Collapse)AuthorAge
* minor fixesAnanya Sen2012-03-07
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/FileIO-jose' into FileIO-ananyaAnanya Sen2012-03-06
|\ | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Squashed commit FileIO-Build-Candidate into MasterValerio Virgillito2012-03-06
| | | | | | | | | | | | Fixing issues with HTML and CSS URLs. Adjusted RegEx logic. Also code a mirror update and undo/redo changes were merged into this request. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | IKNINJA-1238 fix and fixing other js errors on switching and closing documentsAnanya Sen2012-03-06
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
|\| | | | | | | | | | | | | | | | | Conflicts: js/controllers/selection-controller.js js/document/html-document.js js/panels/properties/content.reel/content.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * selection controller sets _isDocument = true if number of selections are 0, ↵Ananya Sen2012-02-28
| | | | | | | | | | | | on switch document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * persist selections while switching documentsAnanya Sen2012-02-28
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixed selection which click after switching to a documentAnanya Sen2012-02-29
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | handle selections for switching documentsAnanya Sen2012-02-29
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | persist selections while switching documentsAnanya Sen2012-02-28
|/ | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* switch html document - re-initialize draw-utils and snap-manager on opening ↵Ananya Sen2012-02-23
| | | | | | a document and while switching documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* enabling nested selectionValerio Virgillito2012-02-20
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merged old FileIOJose Antonio Marquez2012-01-27
|
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>