Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

replace curCSS with css for jQuery 1.8 #61

Merged
merged 1 commit into from over 1 year ago

3 participants

archaeron //de Adam Shaw
archaeron

No description provided.

Adam Shaw arshaw merged commit b39cbf6 into from September 04, 2012
Adam Shaw arshaw closed this September 04, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Aug 17, 2012
archaeron replace curCSS with css for jQuery 1.8 76a1197
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 13 additions and 17 deletions. Show diff stats Hide diff stats

  1. 30  src/util.js
30  src/util.js
@@ -71,7 +71,7 @@ function sliceSegs(events, visEventEnds, start, end) {
71 71
 				msLength: segEnd - segStart
72 72
 			});
73 73
 		}
74  
-	} 
  74
+	}
75 75
 	return segs.sort(segCmp);
76 76
 }
77 77
 
@@ -155,29 +155,26 @@ function setOuterHeight(element, height, includeMargins) {
155 155
 }
156 156
 
157 157
 
158  
-// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
159  
-
160  
-
161 158
 function hsides(element, includeMargins) {
162 159
 	return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
163 160
 }
164 161
 
165 162
 
166 163
 function hpadding(element) {
167  
-	return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
168  
-	       (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
  164
+	return (parseFloat($.css(element[0], 'paddingLeft', true)) || 0) +
  165
+	       (parseFloat($.css(element[0], 'paddingRight', true)) || 0);
169 166
 }
170 167
 
171 168
 
172 169
 function hmargins(element) {
173  
-	return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
174  
-	       (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
  170
+	return (parseFloat($.css(element[0], 'marginLeft', true)) || 0) +
  171
+	       (parseFloat($.css(element[0], 'marginRight', true)) || 0);
175 172
 }
176 173
 
177 174
 
178 175
 function hborders(element) {
179  
-	return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
180  
-	       (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
  176
+	return (parseFloat($.css(element[0], 'borderLeftWidth', true)) || 0) +
  177
+	       (parseFloat($.css(element[0], 'borderRightWidth', true)) || 0);
181 178
 }
182 179
 
183 180
 
@@ -187,20 +184,20 @@ function vsides(element, includeMargins) {
187 184
 
188 185
 
189 186
 function vpadding(element) {
190  
-	return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
191  
-	       (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
  187
+	return (parseFloat($.css(element[0], 'paddingTop', true)) || 0) +
  188
+	       (parseFloat($.css(element[0], 'paddingBottom', true)) || 0);
192 189
 }
193 190
 
194 191
 
195 192
 function vmargins(element) {
196  
-	return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
197  
-	       (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
  193
+	return (parseFloat($.css(element[0], 'marginTop', true)) || 0) +
  194
+	       (parseFloat($.css(element[0], 'marginBottom', true)) || 0);
198 195
 }
199 196
 
200 197
 
201 198
 function vborders(element) {
202  
-	return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
203  
-	       (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
  199
+	return (parseFloat($.css(element[0], 'borderTopWidth', true)) || 0) +
  200
+	       (parseFloat($.css(element[0], 'borderBottomWidth', true)) || 0);
204 201
 }
205 202
 
206 203
 
@@ -368,4 +365,3 @@ function firstDefined() {
368 365
 	}
369 366
 }
370 367
 
371  
-
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.