浏览代码

HUE-290. Make JFrame work stand-alone

* adding jframe external component
* updating widgets.hash
Aaron Newton 15 年之前
父节点
当前提交
f9bfea7381

+ 1 - 0
.gitignore

@@ -35,6 +35,7 @@ dist/
 # Crepo fetched them
 ext/thirdparty/js/art-widgets/
 ext/thirdparty/js/mootools-table/
+ext/thirdparty/js/jframe/
 
 # Make product
 desktop/core/ext-py/lxml/src/lxml/lxml-version.h

+ 2 - 1
desktop/core/src/desktop/settings.py

@@ -232,7 +232,8 @@ def prep_depender_config():
     "../ext/thirdparty/js/slick/package.yml",
     "core/static/js/package.yml",
     "../ext/thirdparty/js/depender/package.yml",
-    "../ext/thirdparty/js/fittext/package.yml"
+    "../ext/thirdparty/js/fittext/package.yml",
+    "../ext/thirdparty/js/jframe/package.yml",
   ]
   scripts_json = [
     ("clientcide",  "../ext/thirdparty/js/clientcide/Source/scripts.json"),

+ 1 - 1
desktop/core/src/desktop/templates/index.mako

@@ -18,7 +18,7 @@
 <head>
   <meta http-equiv="X-UA-Compatible" content="IE=8" />
   <title>Hue</title>
-  <link rel="shortcut icon" href="/static/art/favicon_solid.png" type="image/x-icon" /> 
+  <link rel="shortcut icon" href="/static/art/favicon_solid.png" type="image/x-icon" />
   <link rel="icon" href="/static/art/favicon_solid.png" type="image/x-icon" />
   <link rel="stylesheet" href="/static/css/shared.css" type="text/css" media="screen" title="no title" charset="utf-8">
   <link rel="stylesheet" href="/static/css/reset.css" type="text/css" media="screen" charset="utf-8">

+ 1 - 1
ext/thirdparty/js/behavior.hash

@@ -1 +1 @@
-785ba4f6e01f751871dc236cb5960bd060267e81
+b6b6739f71a2743944713fe8b4a09bbb4c93cacf

+ 1 - 1
ext/thirdparty/js/clientcide.hash

@@ -1 +1 @@
-76754e355afe07ca51ce81f1483abf6c6dac615a
+6a3effa968afe6b3de217217843d87dd730cbef8

+ 1 - 0
ext/thirdparty/js/jframe.hash

@@ -0,0 +1 @@
+9f8285773c5a1e462861941abc8c8a2c5369f30f

+ 9 - 21
ext/thirdparty/js/manifest.json

@@ -1,13 +1,8 @@
 {
+	"default-remote":"origin",
 	"remotes": {
 		"origin": { 
 			"fetch": "git://github.com/cloudera/%(name)s.git"
-		},
-		"anutron": {
-			"fetch": "git://github.com/anutron/%(name)s.git"
-		},
-		"mootools": {
-			"fetch": "git://github.com/mootools/%(name)s.git"
 		}
 	},
 	"projects": {
@@ -26,20 +21,14 @@
 			"track-indirect": "clientcide.hash"
 		},
 		"behavior": {
-			"track-indirect": "behavior.hash",
-			"from-remote": "origin",
-			"remotes": ["origin"]
+			"track-indirect": "behavior.hash"
 		},
 		"more-behaviors": {
-			"track-indirect": "more-behaviors.hash",
-			"from-remote": "anutron",
-			"remotes": ["anutron"]
+			"track-indirect": "more-behaviors.hash"
 		},
 		"mootools-color": {
 			"dir": "color",
-			"track-indirect": "color.hash",
-			"from-remote": "anutron",
-			"remotes": ["anutron"]
+			"track-indirect": "color.hash"
 		},
 		"mootools-touch": {
 			"dir": "touch",
@@ -47,14 +36,13 @@
 		},
 		"art-widgets": {
 			"dir": "widgets",
-			"track-indirect": "widgets.hash",
-			"from-remote": "origin",
-			"remotes": ["origin"]
+			"track-indirect": "widgets.hash"
+		},
+		"jframe": {
+			"track-indirect": "jframe.hash"
 		},
 		"slick": {
-			"track-indirect": "slick.hash",
-			"from-remote": "anutron",
-			"remotes": ["anutron"]
+			"track-indirect": "slick.hash"
 		}
 	}
 }

+ 1 - 1
ext/thirdparty/js/more.hash

@@ -1 +1 @@
-4a14c55b09cf2b90d43d7f6ed6438b1275e21c3c
+a0cea5573df2ede5e707e0ad7074b964d2230c4a