Procházet zdrojové kódy

HUE-98. Fixing various IE issues.

Marcus McLaughlin před 15 roky
rodič
revize
a5c7156f6f

+ 11 - 11
apps/jframegallery/src/jframegallery/templates/html-table.multi-select.menu.html

@@ -29,14 +29,14 @@ limitations under the License.
 		
 		<table data-filters="HtmlTable, ContextMenu" class="multiselect selectable sortable" cellpadding="0" cellspacing="0"
 		data-context-menu-actions="[{'events':['contextmenu'], 'menu':'ul.table-context-menu'}]">
-			<ul class="table-context-menu context-menu ccs-hidden">
+		    <thead>
+		      <tr>
+			<th><ul class="table-context-menu context-menu ccs-hidden">
 				<li class="cm-one">multi-select option 1</li>
 				<li class="cm-two">multi-select option 2</li>
 				<li class="cm-three">multi-select option 3</li>
-			</ul>
-			<thead>
-				<tr>
-					<th>
+			      </ul>
+
 								ID
 					</th>
 					<th>
@@ -55,12 +55,12 @@ limitations under the License.
 			</thead>
 			<tbody>
 				<tr data-filters="ContextMenu" data-context-menu-actions="[{'events':['contextmenu','click:relay(a.show-options)'],'menu':'ul.context-menu'}]">
-					<ul class="context-menu ccs-hidden">
+					<td><ul class="context-menu ccs-hidden">
 						<li class="cm-one">Item 1</li>
 						<li class="cm-two">Item 2</li>
 						<li class="cm-three">Item 3</li>
 					</ul>
-					<td>
+
 						22
 					</td>
 					<td>
@@ -77,12 +77,12 @@ limitations under the License.
 					</td>
 				</tr>
 				<tr data-filters="ContextMenu" data-context-menu-actions="[{'events':['contextmenu','click:relay(a.show-options)'],'menu':'ul.context-menu'}]">
-					<ul class="context-menu ccs-hidden">
+					<td><ul class="context-menu ccs-hidden">
 						<li class="cm-one">Item 1</li>
 						<li class="cm-two">Item 2</li>
 						<li class="cm-three">Item 3</li>
 					</ul>
-					<td>
+
 						23
 					</td>
 					<td>
@@ -99,12 +99,12 @@ limitations under the License.
 					</td>
 				</tr>
 				<tr data-filters="ContextMenu" data-context-menu-actions="[{'events':['contextmenu','click:relay(a.show-options)'],'menu':'ul.context-menu'}]">
-					<ul class="context-menu ccs-hidden">
+					<td><ul class="context-menu ccs-hidden">
 						<li class="cm-one">Item 1</li>
 						<li class="cm-two">Item 2</li>
 						<li class="cm-three">Item 3</li>
 					</ul>
-					<td>
+
 						24
 					</td>
 					<td>

+ 1 - 1
desktop/core/static/js/Source/CCS/CCS.JFrame.js

@@ -614,7 +614,7 @@ CCS.JFrame = new Class({
 		},
 		meta: function(data) {
 			//grab any meta tags and remove them from the html
-			data.meta = Elements.from(data.html.getTags('meta').join(' '));
+			data.meta = data.html.getTags('meta');
 			data.html = data.html.stripTags('meta');
 		},
 		elements: function(data) {

+ 20 - 5
desktop/core/static/js/Source/JFrameFilters/CCS.JFrame.AutoRefresh.js

@@ -24,6 +24,9 @@ script: CCS.JFrame.AutoRefresh.js
 */
 
 (function(){
+var metaRE = /<meta(.*)?\/>/;  //regular expression to remove all but attributes
+var removeQuotes = /"/g; //regular expression to remove quotes
+
 
 CCS.JFrame.addGlobalFilters({
 
@@ -32,12 +35,24 @@ CCS.JFrame.addGlobalFilters({
 		//get the first input.autorefresh and use its value as the duration before 
 		//it auto refreshes the input. if span.sec_to_autorefresh is present, fill its
 		//contents with the number of seconds until a refresh.
-		if (content && content.meta) {
+                if (content && content.meta) {
 			var sec, url;
-			content.meta.each(function(meta) {
-				var parts = meta.get('content').split(';');
-				if (meta.get('http-equiv') == "refresh") {
-					sec = parts[0].toInt();
+                        			content.meta.each(function(meta) {
+			        var match = metaRE.exec(meta);
+                                if(match[1]) {
+                                         var data = match[1]; //set data to string of html attributes, space separated
+                                } else {
+                                         return;
+                                }  
+                                data = data.trim().split(' ');
+                                var attributeMap = new Object;
+                                data.each(function(item) {
+                                        var attribute = item.split('=');
+                                        attributeMap[attribute[0].replace(removeQuotes, '')] = attribute[1].replace(removeQuotes, ''); // remove quotes within string
+                                }); 
+                                var parts = attributeMap['content'].split(';');
+				if (attributeMap['http-equiv'] == "refresh") {
+					sec = parts[0];
 					if (parts[1]) url = unescape(parts[1].replace('url=', ''));
 				}
 			}, this);