aboutsummaryrefslogtreecommitdiff
path: root/js/clipboard/internal-ops
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/clipboard/internal-ops
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/clipboard/internal-ops')
-rw-r--r--js/clipboard/internal-ops/component-clipboard-agent.js4
-rw-r--r--js/clipboard/internal-ops/css-clipboard-agent.js4
-rw-r--r--js/clipboard/internal-ops/elements-clipboard-agent.js4
-rw-r--r--js/clipboard/internal-ops/timeline-clipboard-agent.js4
4 files changed, 8 insertions, 8 deletions
diff --git a/js/clipboard/internal-ops/component-clipboard-agent.js b/js/clipboard/internal-ops/component-clipboard-agent.js
index 3dc41532..31b53474 100644
--- a/js/clipboard/internal-ops/component-clipboard-agent.js
+++ b/js/clipboard/internal-ops/component-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33 33
34var Montage = require("montage/core/core").Montage, 34var Montage = require("montage/core/core").Montage,
35 Component = require("montage/ui/component").Component; 35 Component = require("montage/ui/component").Component;
36 36
37var ComponentsClipboardAgent = exports.ComponentsClipboardAgent = Montage.create(Component, { 37var ComponentsClipboardAgent = exports.ComponentsClipboardAgent = Montage.create(Component, {
38 38
diff --git a/js/clipboard/internal-ops/css-clipboard-agent.js b/js/clipboard/internal-ops/css-clipboard-agent.js
index 42dd09c9..e93077a8 100644
--- a/js/clipboard/internal-ops/css-clipboard-agent.js
+++ b/js/clipboard/internal-ops/css-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33 33
34var Montage = require("montage/core/core").Montage, 34var Montage = require("montage/core/core").Montage,
35 Component = require("montage/ui/component").Component; 35 Component = require("montage/ui/component").Component;
36 36
37var CssClipboardAgent = exports.CssClipboardAgent = Montage.create(Component, { 37var CssClipboardAgent = exports.CssClipboardAgent = Montage.create(Component, {
38 38
diff --git a/js/clipboard/internal-ops/elements-clipboard-agent.js b/js/clipboard/internal-ops/elements-clipboard-agent.js
index 627267fa..4f6e8195 100644
--- a/js/clipboard/internal-ops/elements-clipboard-agent.js
+++ b/js/clipboard/internal-ops/elements-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33 33
34var Montage = require("montage/core/core").Montage, 34var Montage = require("montage/core/core").Montage,
35 Component = require("montage/ui/component").Component, 35 Component = require("montage/ui/component").Component,
36 ClipboardUtil = require("js/clipboard/util").ClipboardUtil, 36 ClipboardUtil = require("js/clipboard/util").ClipboardUtil,
37 World = require("js/lib/drawing/world").World; 37 World = require("js/lib/drawing/world").World;
38 38
diff --git a/js/clipboard/internal-ops/timeline-clipboard-agent.js b/js/clipboard/internal-ops/timeline-clipboard-agent.js
index d8ef7ae9..4e5cfe30 100644
--- a/js/clipboard/internal-ops/timeline-clipboard-agent.js
+++ b/js/clipboard/internal-ops/timeline-clipboard-agent.js
@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
31//////////////////////////////////////////////////////////////////////// 31////////////////////////////////////////////////////////////////////////
32// 32//
33 33
34var Montage = require("montage/core/core").Montage, 34var Montage = require("montage/core/core").Montage,
35 Component = require("montage/ui/component").Component; 35 Component = require("montage/ui/component").Component;
36 36
37var TimelineClipboardAgent = exports.TimelineClipboardAgent = Montage.create(Component, { 37var TimelineClipboardAgent = exports.TimelineClipboardAgent = Montage.create(Component, {
38 38