brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [5/9] incubator-brooklyn git commit: Use remotely hosted ZeroClipboard.swf
Date Tue, 09 Dec 2014 15:48:11 GMT
Use remotely hosted ZeroClipboard.swf

Don't include it in the repository due to licensing issues.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/14a4d550
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/14a4d550
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/14a4d550

Branch: refs/heads/0.7.0-M2-incubating
Commit: 14a4d550eb65057270fe6b1aa232716caad9368a
Parents: a184a0f
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Tue Dec 2 12:15:21 2014 +0200
Committer: Richard Downer <richard@apache.org>
Committed: Tue Dec 9 14:34:09 2014 +0000

----------------------------------------------------------------------
 .../main/webapp/assets/js/libs/ZeroClipboard.swf    | Bin 1891 -> 0 bytes
 .../src/main/webapp/assets/js/view/entity-config.js |   2 +-
 .../main/webapp/assets/js/view/entity-sensors.js    |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14a4d550/usage/jsgui/src/main/webapp/assets/js/libs/ZeroClipboard.swf
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/libs/ZeroClipboard.swf b/usage/jsgui/src/main/webapp/assets/js/libs/ZeroClipboard.swf
deleted file mode 100644
index 56637ff..0000000
Binary files a/usage/jsgui/src/main/webapp/assets/js/libs/ZeroClipboard.swf and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14a4d550/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
index 7524d38..6c3a964 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
@@ -28,7 +28,7 @@ define([
 ], function (_, $, Backbone, Util, ZeroClipboard, ViewUtils, ConfigSummary, ConfigHtml, ConfigNameHtml)
{
 
     // TODO consider extracting all such usages to a shared ZeroClipboard wrapper?
-    ZeroClipboard.config({ moviePath: 'assets/js/libs/ZeroClipboard.swf' });
+    ZeroClipboard.config({ moviePath: '//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.3.1/ZeroClipboard.swf'
});
 
     var configHtml = _.template(ConfigHtml),
         configNameHtml = _.template(ConfigNameHtml);

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/14a4d550/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
index 5f791b4..c7a0070 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
@@ -28,7 +28,7 @@ define([
 ], function (_, $, Backbone, Util, ZeroClipboard, ViewUtils, SensorSummary, SensorsHtml,
SensorNameHtml) {
 
     // TODO consider extracting all such usages to a shared ZeroClipboard wrapper?
-    ZeroClipboard.config({ moviePath: 'assets/js/libs/ZeroClipboard.swf' });
+    ZeroClipboard.config({ moviePath: '//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.3.1/ZeroClipboard.swf'
});
     
     var sensorHtml = _.template(SensorsHtml),
         sensorNameHtml = _.template(SensorNameHtml);


Mime
View raw message