Merge branch 'FLUID-5284' into FLUID-5284-linting

fluid-project · Apr 10, 2014 · 9656d81 · 9656d81
2 parents 6feabbd + f542eb0
commit 9656d81
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -11,7 +11,7 @@
     "latedef": true,
     "newcap": true,
     "noarg": true,
-    "noempty": true,
+    "noempty": false,
     "nonbsp": true,
     "nonew": true,
     "plusplus": false,

diff --git a/src/framework/preferences/css/ie8.css b/src/framework/preferences/css/ie8.css
@@ -3,9 +3,11 @@
 .fl-prefsEditor .fl-prefsEditor-onoff input {
     clip: auto;
     height: 1em;
-    width: 1em;    
-    margin: 0;
+    width: 1em;
+    margin: 0 10px 0 0;
     position: relative;
+    display: inline;
+    float: left;
 }
 .fl-prefsEditor .fl-prefsEditor-onoff .fl-prefsEditor-switch {
     display: none;

diff --git a/src/tests/manual-tests/html/prefsEditorFullNoPreview.html b/src/tests/manual-tests/html/prefsEditorFullNoPreview.html
@@ -27,6 +27,11 @@
 
         <link rel="stylesheet" type="text/css" href="../css/PrefsEditorFullPage.css" /> <!-- Demo style -->
 
+        <!--[if IE 8]>
+            <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/ie8.css" />
+            <link rel="stylesheet" type="text/css" href="../../../demos/uiOptions/css/ie8.css" />
+        <![endif]-->
+
         <title>Preferences Editor: Full Page, Without Preview</title>
         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>

diff --git a/src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html b/src/tests/manual-tests/html/prefsEditorFullNoPreviewSchema.html
@@ -27,6 +27,11 @@
 
         <link rel="stylesheet" type="text/css" href="../css/PrefsEditorFullPage.css" /> <!-- Demo style -->
 
+        <!--[if IE 8]>
+            <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/ie8.css" />
+            <link rel="stylesheet" type="text/css" href="../../../demos/uiOptions/css/ie8.css" />
+        <![endif]-->
+
         <title>Preferences Editor: Full Page, Without Preview, Using Schema</title>
         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>

diff --git a/src/tests/manual-tests/html/prefsEditorFullWithPreview.html b/src/tests/manual-tests/html/prefsEditorFullWithPreview.html
@@ -27,6 +27,11 @@
 
         <link rel="stylesheet" type="text/css" href="../css/PrefsEditorFullPage.css" /> <!-- Demo style -->
 
+        <!--[if IE 8]>
+            <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/ie8.css" />
+            <link rel="stylesheet" type="text/css" href="../../../demos/uiOptions/css/ie8.css" />
+        <![endif]-->
+
         <title>Preferences Editor: Full Page, With Preview</title>
         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>

diff --git a/src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html b/src/tests/manual-tests/html/prefsEditorFullWithPreviewSchema.html
@@ -27,6 +27,11 @@
 
         <link rel="stylesheet" type="text/css" href="../css/PrefsEditorFullPage.css" /> <!-- Demo style -->
 
+        <!--[if IE 8]>
+            <link rel="stylesheet" type="text/css" href="../../../framework/preferences/css/ie8.css" />
+            <link rel="stylesheet" type="text/css" href="../../../demos/uiOptions/css/ie8.css" />
+        <![endif]-->
+
         <title>Preferences Editor: Full Page, With Preview, Using Schema</title>
         <script type="text/javascript" src="../../../lib/jquery/core/js/jquery.js"></script>
         <script type="text/javascript" src="../../../lib/jquery/ui/js/jquery.ui.core.js"></script>