aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAnanya Sen2012-07-23 17:01:14 -0700
committerAnanya Sen2012-07-23 17:01:14 -0700
commit48d9ed19573a07c68da305d14ca6ab3a04d31d64 (patch)
treeb4bf6c48c7fdade2cf531d84cac3359489d38405 /js
parentc07a7a9d11bc8299fa9686544b18840cc8e640c2 (diff)
parentafc7ad4f240fdf7890a79c2d4d7f8eb2e7c30a34 (diff)
downloadninja-48d9ed19573a07c68da305d14ca6ab3a04d31d64.tar.gz
Merge branch 'refs/heads/Jose-Document' into Document
Diffstat (limited to 'js')
-rw-r--r--js/clipboard/external-apps-clipboard-agent.js185
-rw-r--r--js/clipboard/internal-ops/elements-clipboard-agent.js24
-rw-r--r--js/components/converter/node-name-converter.js (renamed from js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js)24
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.html6
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.css13
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html20
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js20
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.css49
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html55
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.js77
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.css4
-rw-r--r--js/controllers/clipboard-controller.js14
-rwxr-xr-xjs/controllers/elements/shapes-controller.js8
-rwxr-xr-xjs/controllers/styles-controller.js110
-rwxr-xr-xjs/data/menu-data.js582
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js658
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js4
-rwxr-xr-xjs/helper-classes/3D/view-utils.js99
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js14
-rwxr-xr-xjs/lib/geom/circle.js57
-rwxr-xr-xjs/lib/geom/geom-obj.js24
-rwxr-xr-xjs/lib/geom/line.js26
-rwxr-xr-xjs/lib/geom/rectangle.js57
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js14
-rw-r--r--js/lib/rdge/materials/water-material.js14
-rwxr-xr-xjs/mediators/element-mediator.js15
-rwxr-xr-xjs/mediators/keyboard-mediator.js16
-rwxr-xr-xjs/models/app-model.js169
-rwxr-xr-xjs/models/element-model.js8
-rwxr-xr-xjs/models/materials-model.js18
-rwxr-xr-xjs/ninja.reel/ninja.html22
-rwxr-xr-xjs/ninja.reel/ninja.js52
-rw-r--r--js/panels/Materials/materials-data.json18
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js28
-rwxr-xr-xjs/panels/Splitter.js2
-rw-r--r--js/panels/Timeline/DragDrop.js161
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js104
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js29
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js384
-rw-r--r--js/panels/Timeline/Span.reel/Span.js192
-rw-r--r--js/panels/Timeline/Style.reel/Style.js695
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css124
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html26
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2849
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css128
-rwxr-xr-xjs/panels/Timeline/TimelinePanel.reel/images/knob.pngbin0 -> 1036 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss55
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js1019
-rw-r--r--js/panels/Timeline/Track.reel/Track.html88
-rw-r--r--js/panels/Timeline/Track.reel/Track.js212
-rw-r--r--js/panels/Timeline/Track.reel/css/Track.css57
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html55
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css36
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js153
-rwxr-xr-xjs/panels/color/colorpopup-manager.js26
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.js2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html3
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.js20
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js10
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js6
-rw-r--r--js/panels/css-panel/styles-view-delegate.js3
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.js2
-rwxr-xr-xjs/stage/layout.js58
-rwxr-xr-xjs/stage/stage.reel/stage.js356
-rwxr-xr-xjs/tools/Rotate3DToolBase.js1
-rwxr-xr-xjs/tools/SelectionTool.js2
-rwxr-xr-xjs/tools/ShapeTool.js34
-rwxr-xr-xjs/tools/Translate3DToolBase.js1
-rwxr-xr-xjs/tools/modifier-tool-base.js3
-rw-r--r--js/ui/menu/menu-controller.js636
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.css (renamed from js/components/menu/menu-entry.reel/menu-entry.css)55
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.html (renamed from js/components/menu/menu-entry.reel/menu-entry.html)37
-rwxr-xr-xjs/ui/menu/menu-entry.reel/menu-entry.js (renamed from js/components/menu/menu-entry.reel/menu-entry.js)90
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.css (renamed from js/components/menu/menu-item.reel/menu-item.css)101
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.html (renamed from js/components/menu/menu-item.reel/menu-item.html)67
-rwxr-xr-xjs/ui/menu/menu-item.reel/menu-item.js (renamed from js/components/menu/menu-item.reel/menu-item.js)150
-rwxr-xr-xjs/ui/menu/menu.reel/menu.css (renamed from js/components/menu/menu.reel/menu.css)4
-rwxr-xr-xjs/ui/menu/menu.reel/menu.html (renamed from js/components/menu/menu.reel/menu.html)21
-rwxr-xr-xjs/ui/menu/menu.reel/menu.js (renamed from js/components/menu/menu.reel/menu.js)78
81 files changed, 5041 insertions, 5602 deletions
diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 6b9d8090..b82784d3 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -38,40 +38,52 @@ var Montage = require("montage/core/core").Montage,
38 38
39var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.create(Component, { 39var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.create(Component, {
40 40
41 //count how many times pasted
42 //used to move multiple pastes of same copy
43 pasteCounter:{
44 value: 0
45 },
46
41 paste:{ 47 paste:{
42 value: function(clipboardEvent){ 48 value: function(clipboardEvent){
43 var clipboardData = clipboardEvent.clipboardData, 49 var clipboardData = clipboardEvent.clipboardData,
44 htmlData = clipboardData.getData("text/html"), 50 htmlData = clipboardData.getData("text/html"),
45 textData = clipboardData.getData("text/plain"), 51 textData = clipboardData.getData("text/plain"),
46 i=0, 52 i=0,
47 imageMime, imageData, imageElement; 53 imageMime, imageData, imageElement, isImage = false, imageItem;
48 54
49 //handle image blobs 55 if(clipboardData.items && (clipboardData.items.length > 0)){//handle image blobs
50 if(clipboardData.items && (clipboardData.items.length > 0)){
51 for(i=0; i < clipboardData.items.length; i++ ){ 56 for(i=0; i < clipboardData.items.length; i++ ){
52 if((clipboardData.items[i].kind === "file") && (clipboardData.items[i].type.indexOf("image") === 0)){//example type -> "image/png" 57 if((clipboardData.items[i].kind === "file") && (clipboardData.items[i].type.indexOf("image") === 0)){//example type -> "image/png"
53 imageMime = clipboardData.items[i].type; 58 isImage = true;
54 imageData = clipboardData.items[i].getAsFile(); 59 if(clipboardData.items[i].type === "image/png"){
55 try{ 60 imageItem = clipboardData.items[i];//grab the png image from clipboard
56 imageElement = this.pasteImageBinary(imageData); 61 }
57 }catch(e){ 62 else if(i===0){
58 console.log(""+e.stack); 63 imageItem = clipboardData.items[i];
59 } 64 }
60 this.application.ninja.selectionController.selectElements(imageElement);
61 this.application.ninja.currentDocument.model.needsSave = true;
62
63 } 65 }
64 } 66 }
65 } 67 }
66 68
67 try{ 69 if(isImage && imageItem){
68 if(!!htmlData || !!textData){ 70 imageMime = imageItem.type;
69 this.pasteHtml(htmlData, textData); 71 imageData = imageItem.getAsFile();
72 try{
73 imageElement = this.pasteImageBinary(imageData);
74 }catch(e){
75 console.log(""+e.stack);
70 } 76 }
71 }catch(e){ 77 this.application.ninja.currentDocument.model.needsSave = true;
72 console.log(""+e.stack);
73 } 78 }
74 79
80 if(!isImage && (!!htmlData || !!textData)){
81 try{
82 this.doPasteHtml(htmlData, textData);
83 }catch(e){
84 console.log(""+e.stack);
85 }
86 }
75 } 87 }
76 }, 88 },
77