Fixes to Email ui.

jvliwanag · Nov 8, 2011 · f7077a9 · f7077a9
1 parent 751e1c3
commit f7077a9
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 15 deletions.
diff --git a/contrib/dojo/agentUI/EmailPane.js b/contrib/dojo/agentUI/EmailPane.js
@@ -237,7 +237,7 @@ dojo.declare("agentUI.EmailPane", [dijit._Widget, dijit._Templated], {
 	_fetchPaths: function(skel){
 		var paths = emailLib.pathsToFetch(skel);
 		var disp = this.emailViewDiv;
-		disp.sub = dojo.subscribe("emailLib/fetchPaths/done" + this.channelId, function(fetched){
+		disp.sub = dojo.subscribe("emailLib/fetchPaths/done" + this.channelId, this, function(fetched){
 			console.log('fetching of paths complete', fetched);
 			dojo.unsubscribe(disp.sub);
 			disp.innerHTML = fetched;
@@ -268,7 +268,7 @@ dojo.declare("agentUI.EmailPane", [dijit._Widget, dijit._Templated], {
 				//so that successive calls to nodes[i].hostname gets the correct value
 				nodes[i].href = nodes[i].href;
 			}
-			emailLib.getFrom(_fetchFromCallback);
+			this.email.getFrom(this._fetchFromCallback);
 		});
 	},
 

diff --git a/contrib/dojo/agentUI/emailLib.js b/contrib/dojo/agentUI/emailLib.js
@@ -65,7 +65,7 @@ if(typeof(emailLib) === 'undefined'){
 		}
 
 		var jpath = fetchObjs[0].path.join("/");
-		var fetchSubChan = 'emailLib/get_path/' + jpath + '/' + this.channel.channelId;
+		var fetchSubChan = 'emailLib/get_path/' + this.channel.channelId + '/' + jpath;
 		console.log("subbed to", fetchSubChan);
 		if(fetchObjs[0].mode === 'a'){
 			fetched += '<a href="/' + jpath + '" target="_blank"><img src="/images/dl.png" style="border:none"/>' + fetchObjs[0].label + '</a>';

diff --git a/contrib/dojo/agentUI/nls/EmailPane.js b/contrib/dojo/agentUI/nls/EmailPane.js
@@ -1,4 +1,5 @@
-{
+define({root:
+({
 	REMOVE_ATTACHMENT:'Remove Attachment',
 	TO:'To',
 	FROM:'From',
@@ -12,4 +13,34 @@
 	UPLOAD:'Upload',
 	SUBMIT:'Submit',
 	CANCEL:'Cancel'
-}
+}),
+"zh": true,
+"zh-tw": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"hu": true,
+"he": true,
+"fr": true,
+"fi": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"ar": true
+});
diff --git a/contrib/dojo/release/agentUI/agentUI/nls/emailPane.js b/contrib/dojo/release/agentUI/agentUI/nls/emailPane.js
@@ -1,5 +1,6 @@
 //>>built
-{
+define({root:
+({
 	REMOVE_ATTACHMENT:'Remove Attachment',
 	TO:'To',
 	FROM:'From',
@@ -13,4 +14,34 @@
 	UPLOAD:'Upload',
 	SUBMIT:'Submit',
 	CANCEL:'Cancel'
-}
+}),
+"zh": true,
+"zh-tw": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"hu": true,
+"he": true,
+"fr": true,
+"fi": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"ar": true
+});
diff --git a/contrib/dojo/release/agentUI/build-report.txt b/contrib/dojo/release/agentUI/build-report.txt
@@ -1,4 +1,4 @@
-Build started: Thu Nov 03 2011 16:59:18 GMT-0500 (CDT)
+Build started: Mon Nov 07 2011 16:04:14 GMT-0600 (CST)
 Build application version: 1.7.0dev (23930)
 Messages:
 message-id(100) Assumed module uses legacy loader API.
@@ -565,7 +565,6 @@ error(310) Non-i18n module found in nls tree (copied only).
 	module: agentUI/nls/ru/labels
 	module: agentUI/nls/uk/labels
 	module: agentUI/nls/en/emailPane
-	module: agentUI/nls/emailPane
 	module: agentUI/nls/es/labels
 	module: agentUI/nls/en/labels
 error(311) Missing dependency.
@@ -763,6 +762,6 @@ dojo/dojo:
 
 
 Process finished normally
-	errors: 13
+	errors: 12
 	warnings: 37
-	build time: 59.88 seconds
+	build time: 62.679 seconds
diff --git a/priv/www/agent/application/EmailPane.js b/priv/www/agent/application/EmailPane.js
@@ -237,7 +237,7 @@ dojo.declare("agentUI.EmailPane", [dijit._Widget, dijit._Templated], {
 	_fetchPaths: function(skel){
 		var paths = emailLib.pathsToFetch(skel);
 		var disp = this.emailViewDiv;
-		disp.sub = dojo.subscribe("emailLib/fetchPaths/done/" + this.channelId, function(fetched){
+		disp.sub = dojo.subscribe("emailLib/fetchPaths/done/" + this.channelId, this, function(fetched){
 			console.log('fetching of paths complete', fetched);
 			dojo.unsubscribe(disp.sub);
 			disp.innerHTML = fetched;
@@ -268,7 +268,7 @@ dojo.declare("agentUI.EmailPane", [dijit._Widget, dijit._Templated], {
 				//so that successive calls to nodes[i].hostname gets the correct value
 				nodes[i].href = nodes[i].href;
 			}
-			emailLib.getFrom(_fetchFromCallback);
+			this.email.getFrom(this._fetchFromCallback);
 		});
 		this.email.fetchPaths(paths);
 	},

diff --git a/priv/www/contrib/agentUI/nls/EmailPane.js b/priv/www/contrib/agentUI/nls/EmailPane.js
@@ -1,5 +1,6 @@
 //>>built
-{
+define({root:
+({
 	REMOVE_ATTACHMENT:'Remove Attachment',
 	TO:'To',
 	FROM:'From',
@@ -13,4 +14,34 @@
 	UPLOAD:'Upload',
 	SUBMIT:'Submit',
 	CANCEL:'Cancel'
-}
+}),
+"zh": true,
+"zh-tw": true,
+"tr": true,
+"th": true,
+"sv": true,
+"sl": true,
+"sk": true,
+"ru": true,
+"ro": true,
+"pt": true,
+"pt-pt": true,
+"pl": true,
+"nl": true,
+"nb": true,
+"ko": true,
+"kk": true,
+"ja": true,
+"it": true,
+"hu": true,
+"he": true,
+"fr": true,
+"fi": true,
+"es": true,
+"el": true,
+"de": true,
+"da": true,
+"cs": true,
+"ca": true,
+"ar": true
+});