aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-02 09:23:13 -0700
committerNivesh Rajbhandari2012-07-02 09:23:13 -0700
commit2bae1b3148233288ec0bc50876935bdfea1f288c (patch)
tree686fa3b5b9615941bb7013f35c91e8f326b049db
parent2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
-rw-r--r--js/clipboard/internal-ops/elements-clipboard-agent.js6
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js9
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.js12
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js4
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js4
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js2
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js6
-rwxr-xr-xjs/controllers/color-controller.js17
-rwxr-xr-xjs/controllers/elements/body-controller.js5
-rwxr-xr-xjs/controllers/elements/shapes-controller.js119
-rw-r--r--js/controllers/objects-controller.js6
-rw-r--r--js/controllers/presets-controller.js20
-rwxr-xr-xjs/controllers/styles-controller.js33
-rwxr-xr-xjs/document/mediators/template.js10
-rwxr-xr-xjs/document/templates/banner/index.html2
-rwxr-xr-xjs/document/templates/html/index.html2
-rwxr-xr-xjs/document/views/design.js22
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js12
-rwxr-xr-xjs/ninja.reel/ninja.html2
-rwxr-xr-xjs/ninja.reel/ninja.js16
-rwxr-xr-xjs/panels/CSSPanel/css-shorthand-map.js11
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js13
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js20
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js25
-rw-r--r--js/panels/Timeline/Span.reel/Span.js6
-rw-r--r--js/panels/Timeline/Style.reel/Style.html4
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css52
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss5
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js245
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css36
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss3
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html21
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js88
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js12
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.html62
-rwxr-xr-xjs/panels/color/colorchippopup.reel/colorchippopup.js589
-rwxr-xr-xjs/panels/color/colorchippopup.reel/config.rb9
-rwxr-xr-xjs/panels/color/colorchippopup.reel/css/colorchippopup.css239
-rwxr-xr-xjs/panels/color/colorchippopup.reel/css/colorchippopup.scss240
-rwxr-xr-xjs/panels/color/colorchippopup.reel/img/knob.pngbin1036 -> 0 bytes
-rwxr-xr-xjs/panels/color/colorpanelbase.reel/colorpanelbase.js97
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.js169
-rwxr-xr-xjs/panels/color/colorpopup-manager.js639
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.html53
-rwxr-xr-xjs/panels/color/colortoolbar.reel/colortoolbar.js138
-rwxr-xr-xjs/panels/color/colortoolbar.reel/config.rb9
-rwxr-xr-xjs/panels/color/colortoolbar.reel/css/colortoolbar.css45
-rwxr-xr-xjs/panels/color/colortoolbar.reel/css/colortoolbar.scss52
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js3
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js5
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js8
-rw-r--r--js/panels/css-panel/styles-view-delegate.js22
-rwxr-xr-xjs/panels/properties.reel/properties.css8
-rwxr-xr-xjs/panels/properties.reel/properties.js19
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js18
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js30
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.css38
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.html3
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.js105
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html8
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.js38
-rw-r--r--js/tools/BrushTool.js15
-rwxr-xr-xjs/tools/FillTool.js5
-rwxr-xr-xjs/tools/LineTool.js22
-rwxr-xr-xjs/tools/OvalTool.js19
-rwxr-xr-xjs/tools/PenTool.js32
-rwxr-xr-xjs/tools/RectTool.js19
-rwxr-xr-xjs/tools/ShapeTool.js16
-rwxr-xr-xjs/tools/TagTool.js37
-rw-r--r--js/tools/bindingTool.js20
-rw-r--r--manifest.json2
-rw-r--r--node_modules/components-data/map.json2
-rw-r--r--node_modules/descriptor.json10
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html2
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html1
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js3
-rw-r--r--[-rwxr-xr-x]node_modules/montage-google/map.reel/icons/airplane.png (renamed from js/panels/color/colorchippopup.reel/img/icon_bitmap.png)bin3072 -> 3004 bytes
-rw-r--r--[-rwxr-xr-x]node_modules/montage-google/map.reel/icons/cafe.png (renamed from js/panels/color/colorchippopup.reel/img/icon_colorwheel.png)bin3420 -> 2958 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/coffee.pngbin0 -> 3052 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/food.pngbin0 -> 3038 bytes
-rw-r--r--[-rwxr-xr-x]node_modules/montage-google/map.reel/icons/fork-and-knife.png (renamed from js/panels/color/colorchippopup.reel/img/icon_gradient.png)bin2815 -> 2882 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/map-marker.pngbin0 -> 3131 bytes
-rw-r--r--[-rwxr-xr-x]node_modules/montage-google/map.reel/icons/medical.png (renamed from js/panels/color/colorchippopup.reel/img/icon_nofill.png)bin2951 -> 2915 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/picture-frame.pngbin0 -> 2928 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/shopping.pngbin0 -> 2970 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/widescreen.pngbin0 -> 2986 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/wine-bottle.pngbin0 -> 187 bytes
-rw-r--r--node_modules/montage-google/map.reel/icons/wine-glass.pngbin0 -> 2983 bytes
-rw-r--r--node_modules/montage-google/map.reel/map.js27
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.html1
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.html11
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.js19
99 files changed, 1622 insertions, 2159 deletions
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js
index cd8de46e..1a4bfdba 100644
--- a/js/clipboard/internal-ops/elements-clipboard-agent.js
+++ b/js/clipboard/internal-ops/elements-clipboard-agent.js
@@ -232,7 +232,8 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
232 canvas.height = sourceCanvas.height; 232 canvas.height = sourceCanvas.height;
233 //end - clone copied canvas 233 //end - clone copied canvas
234 234
235 if (!canvas.getAttribute( "data-RDGE-id" )) canvas.setAttribute( "data-RDGE-id", document.application.njUtils.generateRandom() ); 235 //genenerate data-RDGE-id only for shapes
236 if (sourceCanvas.elementModel.shapeModel && !canvas.getAttribute( "data-RDGE-id" )) canvas.setAttribute( "data-RDGE-id", document.application.njUtils.generateRandom() );
236 237
237 if(sourceCanvas.ownerDocument.defaultView.getComputedStyle(sourceCanvas).getPropertyValue("position") === "absolute"){ 238 if(sourceCanvas.ownerDocument.defaultView.getComputedStyle(sourceCanvas).getPropertyValue("position") === "absolute"){
238 styles = canvas.elementModel.data || {}; 239 styles = canvas.elementModel.data || {};
@@ -275,7 +276,8 @@ var ElementsClipboardAgent = exports.ElementsClipboardAgent = Montage.create(Com
275 canvas.width = styles.width; 276 canvas.width = styles.width;
276 canvas.height = styles.height; 277 canvas.height = styles.height;
277 278
278 if (!canvas.getAttribute( "data-RDGE-id" )) canvas.setAttribute( "data-RDGE-id", document.application.njUtils.generateRandom() ); 279 //genenerate data-RDGE-id only for shapes
280 if (worldJson && !canvas.getAttribute( "data-RDGE-id" )) canvas.setAttribute( "data-RDGE-id", document.application.njUtils.generateRandom() );
279 281
280 this.pastePositioned(canvas, styles, false/*from copy*/); 282 this.pastePositioned(canvas, styles, false/*from copy*/);
281 283
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 6071f3c6..f912eb51 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -43,7 +43,7 @@ exports.GradientPicker = Montage.create(Component, {
43 get: function() {return this._mode;}, 43 get: function() {return this._mode;},
44 set: function(value) { 44 set: function(value) {
45 // 45 //
46 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); 46 this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
47 // 47 //
48 this._mode = value; 48 this._mode = value;
49 // 49 //
@@ -132,7 +132,7 @@ exports.GradientPicker = Montage.create(Component, {
132 value: function(data, silent) { 132 value: function(data, silent) {
133 if (this.application.ninja.colorController.colorPopupManager) { 133 if (this.application.ninja.colorController.colorPopupManager) {
134 //Hiding any open popups (of gradient buttons) 134 //Hiding any open popups (of gradient buttons)
135 this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); 135 this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup();
136 //Creating stop elements 136 //Creating stop elements
137