dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36472
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18656: Analysis, IE11 fix.
------------------------------------------------------------
revno: 18656
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2015-03-22 20:08:11 +0100
message:
Analysis, IE11 fix.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2015-03-22 19:08:11 +0000
@@ -5,9 +5,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// namespace
ER = {};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-03-05 17:36:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-03-22 19:08:11 +0000
@@ -61,9 +61,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// override
Ext.override(Ext.chart.Chart, {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js 2015-02-25 22:07:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js 2015-03-22 19:08:11 +0000
@@ -1460,9 +1460,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// gis
GIS = {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js 2015-03-22 19:08:11 +0000
@@ -5,9 +5,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// namespace
PT = {};
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-02-24 15:35:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-03-22 19:08:11 +0000
@@ -61,9 +61,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// override
Ext.override(Ext.chart.Chart, {
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-03-22 19:08:11 +0000
@@ -61,9 +61,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// override
Ext.override(Ext.chart.Chart, {
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-03-22 19:08:11 +0000
@@ -61,9 +61,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// override
Ext.override(Ext.chart.Chart, {
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js 2015-03-22 19:08:11 +0000
@@ -5,9 +5,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// namespace
ER = {};
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js 2015-02-25 22:07:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js 2015-03-22 19:08:11 +0000
@@ -1460,9 +1460,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// gis
GIS = {
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js 2015-03-22 19:08:11 +0000
@@ -5,9 +5,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// namespace
PT = {};
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-03-22 19:08:11 +0000
@@ -61,9 +61,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// override
Ext.override(Ext.chart.Chart, {
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-03-22 19:08:11 +0000
@@ -61,9 +61,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// override
Ext.override(Ext.chart.Chart, {
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js 2015-03-22 19:08:11 +0000
@@ -5,9 +5,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// namespace
ER = {};
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-02-25 22:07:00 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-03-22 19:08:11 +0000
@@ -1460,9 +1460,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// gis
GIS = {
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-02-25 15:17:20 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-03-22 19:08:11 +0000
@@ -5,9 +5,39 @@
// ext config
Ext.Ajax.method = 'GET';
- Ext.isIE = function() {
- return /trident/.test(Ext.userAgent);
- }();
+ Ext.isIE = (/trident/.test(Ext.userAgent));
+
+ Ext.isIE11 = Ext.isIE && (/rv:11.0/.test(Ext.userAgent));
+
+ Ext.util.CSS.createStyleSheet = function(cssText, id) {
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
+ if (id) {
+ styleEl.setAttribute("id", id);
+ }
+
+ if (Ext.isIE && !Ext.isIE11) {
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet;
+ ss.cssText = cssText;
+ }
+ else {
+ try {
+ styleEl.appendChild(document.createTextNode(cssText));
+ }
+ catch(e) {
+ styleEl.cssText = cssText;
+ }
+ head.appendChild(styleEl);
+ ss = styleEl.styleSheet ? styleEl.styleSheet : (styleEl.sheet || document.styleSheets[document.styleSheets.length-1]);
+ }
+ this.cacheStyleSheet(ss);
+ return ss;
+ };
// namespace
PT = {};
