fixed bug with IE version to use right XHr request method in IE7

chuckcarpenter · Jun 6, 2014 · ef0a71b · ef0a71b
1 parent cdde3e3
commit ef0a71b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -17,5 +17,9 @@
     "strict": false,
     "trailing": true,
     "smarttabs": true,
-    "globals": {"define": false}
+    "globals": {
+        "define": false,
+        "XDomainRequest": false,
+        "ActiveXObject": false
+    }
 }
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -1,10 +1,13 @@
 'use strict'
 module.exports = (grunt) ->
     # load all grunt tasks
-    # this assumes matchdep, grunt-contrib-watch, grunt-contrib-coffee, 
+    # this assumes matchdep, grunt-contrib-watch, grunt-contrib-coffee,
     # grunt-coffeelint, grunt-contrib-clean, grunt-contrib-uglify is in the package.json file
     require('matchdep').filterDev('grunt-*').forEach grunt.loadNpmTasks
 
+    # Timing on Grunt tasks completion
+    require('time-grunt') grunt
+
     grunt.initConfig
         # load in the module information
         pkg: grunt.file.readJSON 'package.json'
@@ -18,7 +21,7 @@ module.exports = (grunt) ->
                         ' * Copyright (c) <%= grunt.template.today("yyyy") %>' +
                         '  | <%= pkg.authors %>;\n' +
                         '**/\n'
-        
+
 
         # clear out any unneccessary files
         clean: ['js/<%= pkg.name %>.min.js']
@@ -40,9 +43,9 @@ module.exports = (grunt) ->
                 files:
                     'js/<%= pkg.name %>.min.js': 'js/<%= pkg.name %>.js'
 
-        ## TODO: add some tests                    
-    
- 
+        ## TODO: add some tests
+
+
     grunt.registerTask 'default', [
         'clean'
         'jshint'

diff --git a/index.html b/index.html
@@ -10,11 +10,10 @@
   <link rel="stylesheet" type="text/css" href="css/general.css" />
   <!-- CSS containing @import lines, test importing of additional sheets -->
   <link rel="stylesheet" type="text/css" href="css/importer.css" />
-  <!-- ignore.css shows in normal browsers, but ones where we expect the REM.js to 
+  <!-- ignore.css shows in normal browsers, but ones where we expect the REM.js to
        run then the REM rules should not get parsed.
    -->
   <link rel="stylesheet" type="text/css" href="css/ignore.css" data-norem />
-
 </head>
 <body>
   <div class="test">Hello World!</div>

diff --git a/js/rem.js b/js/rem.js
@@ -135,7 +135,7 @@
             return v > 4 ? v : undef;
             }());
 
-            if ( ie >= 7 ){ //If IE is greater than 6
+            if ( ie >= 8 ){ //If IE is greater than 7
                 // This targets modern browsers and modern versions of IE,
                 // which don't need the "new" keyword.
                 xhr.onreadystatechange = function () {

diff --git a/js/rem.min.js b/js/rem.min.js
diff --git a/package.json b/package.json
@@ -20,7 +20,8 @@
     "karma-ie-launcher": "~0.1.1",
     "karma-firefox-launcher": "~0.1.0",
     "karma-phantomjs-launcher": "~0.1.0",
-    "karma-safari-launcher": "~0.1.1"
+    "karma-safari-launcher": "~0.1.1",
+    "time-grunt": "^0.3.2"
   },
   "dependencies": {}
 }