Permalink
Browse files

Fix various features erroring in Chrome and upgrade Bootstrap

  • Loading branch information...
chrispederick committed Nov 22, 2013
1 parent e06071c commit 90b68a14d8498614c1e7bc77c972c14ef5fb848b
View
@@ -1213,7 +1213,7 @@
<!-- Runs JSHint on the extension -->
<target name="jshint" depends="convert.tabs.spaces">
<echo level="info" message="Running JSHint"/>
- <property name="jshint.globals" value="$:true,BrowserPageInfo:true,BrowserReload:true,BrowserViewSourceOfDocument:true,chrome:true,CodeMirror:true,Components:true,CSSPrimitiveValue:true,getWebNavigation:true,HTMLDocument:true,ich:true,inspectDOMDocument:true,js_beautify:true,Node:true,NodeFilter:true,pref:true,toJavaScriptConsole:true,WebDeveloper:true,WebDeveloperApplication:true,WebDeveloperValidateCSS:true,WebDeveloperValidateHTML:true"/>
+ <property name="jshint.globals" value="$:true,BrowserPageInfo:true,BrowserReload:true,BrowserViewSourceOfDocument:true,chrome:true,CodeMirror:true,Components:true,CSSPrimitiveValue:true,gDevToolsBrowser:true,getWebNavigation:true,HTMLDocument:true,ich:true,inspectDOMDocument:true,js_beautify:true,Node:true,NodeFilter:true,pref:true,toJavaScriptConsole:true,WebDeveloper:true,WebDeveloperApplication:true,WebDeveloperValidateCSS:true,WebDeveloperValidateHTML:true"/>
<property name="jshint.options" value="bitwise:false,eqeqeq:false,forin:false,plusplus:false,strict:false"/>
<jshint dir="../source/chrome/javascript" excludes="**/jquery/tablednd.js" fail="false" globals="${jshint.globals}" options="${jshint.options}"/>
<jshint dir="../source/common/javascript" excludes="**/beautify/beautify.js,**/bootstrap/collapse.js,**/bootstrap/dropdown.js,**/bootstrap/modal.js,**/bootstrap/popover.js,**/bootstrap/tab.js,**/bootstrap/tooltip.js,**/bootstrap/transition.js,**/codemirror/codemirror.js,**/codemirror/css.js,**/codemirror/htmlmixed.js,**/codemirror/javascript.js,**/codemirror/searchcursor.js,**/jquery/icanhaz.js,**/jquery/jquery.js,**/codemirror/xml.js" fail="false" globals="${jshint.globals}" options="${jshint.options}"/>
@@ -1226,7 +1226,7 @@
<echo level="info" message="Running JSLint"/>
<jslint haltOnFailure="false" options="browser,forin,indent=2,maxerr=100,undef">
<formatter type="plain"/>
- <predef>$$,BrowserPageInfo,BrowserReload,BrowserViewSourceOfDocument,chrome,CodeMirror,Components,CSSPrimitiveValue,getWebNavigation,HTMLDocument,ich,Image,inspectDOMDocument,js_beautify,Node,NodeFilter,pref,toJavaScriptConsole,WebDeveloper,WebDeveloperApplication,WebDeveloperValidateCSS,WebDeveloperValidateHTML,window</predef>
+ <predef>$$,BrowserPageInfo,BrowserReload,BrowserViewSourceOfDocument,chrome,CodeMirror,Components,CSSPrimitiveValue,gDevToolsBrowser,getWebNavigation,HTMLDocument,ich,Image,inspectDOMDocument,js_beautify,Node,NodeFilter,pref,toJavaScriptConsole,WebDeveloper,WebDeveloperApplication,WebDeveloperValidateCSS,WebDeveloperValidateHTML,window</predef>
<fileset dir="../source/chrome/javascript" excludes="**/jquery/tablednd.js"/>
<fileset dir="../source/common/javascript" excludes="**/beautify/beautify.js,**/bootstrap/collapse.js,**/bootstrap/dropdown.js,**/bootstrap/modal.js,**/bootstrap/popover.js,**/bootstrap/tab.js,**/bootstrap/tooltip.js,**/bootstrap/transition.js,**/codemirror/codemirror.js,**/codemirror/css.js,**/codemirror/htmlmixed.js,**/codemirror/javascript.js,**/codemirror/searchcursor.js,**/jquery/icanhaz.js,**/jquery/jquery.js,**/codemirror/xml.js"/>
<fileset dir="../source/firefox/javascript"/>
@@ -9,7 +9,7 @@
"manifest_version": 2,
"name": "__MSG_extensionName__",
"options_page": "options/options.html",
- "permissions": ["clipboardWrite", "contentSettings", "cookies", "history", "proxy", "tabs", "<all_urls>"],
+ "permissions": ["clipboardWrite", "contentSettings", "cookies", "history", "tabs", "<all_urls>"],
"version": "@version@",
"web_accessible_resources": ["*"]
}
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: collapse.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#collapse
+ * Bootstrap: collapse.js v3.0.2
+ * http://getbootstrap.com/javascript/#collapse
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -176,4 +176,4 @@
$target.collapse(option)
})
-}(window.jQuery);
+}(jQuery);
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: dropdown.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#dropdowns
+ * Bootstrap: dropdown.js v3.0.2
+ * http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -151,4 +151,4 @@
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-}(window.jQuery);
+}(jQuery);
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: modal.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#modals
+ * Bootstrap: modal.js v3.0.2
+ * http://getbootstrap.com/javascript/#modals
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -243,4 +243,4 @@
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
-}(window.jQuery);
+}(jQuery);
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: popover.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#popovers
+ * Bootstrap: popover.js v3.0.2
+ * http://getbootstrap.com/javascript/#popovers
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -114,4 +114,4 @@
return this
}
-}(window.jQuery);
+}(jQuery);
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: tab.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tabs
+ * Bootstrap: tab.js v3.0.2
+ * http://getbootstrap.com/javascript/#tabs
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
Tab.prototype.show = function () {
var $this = this.element
var $ul = $this.closest('ul:not(.dropdown-menu)')
- var selector = $this.attr('data-target')
+ var selector = $this.data('target')
if (!selector) {
selector = $this.attr('href')
@@ -132,4 +132,4 @@
$(this).tab('show')
})
-}(window.jQuery);
+}(jQuery);
@@ -1,9 +1,9 @@
/* ========================================================================
- * Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tooltip
+ * Bootstrap: tooltip.js v3.0.2
+ * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -383,4 +383,4 @@
return this
}
-}(window.jQuery);
+}(jQuery);
@@ -1,6 +1,6 @@
/* ========================================================================
- * Bootstrap: transition.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#transitions
+ * Bootstrap: transition.js v3.0.2
+ * http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
@@ -53,4 +53,4 @@
$.support.transition = transitionEnd()
})
-}(window.jQuery);
+}(jQuery);
@@ -436,10 +436,18 @@ WebDeveloper.Content.getDocuments = function(frame)
{
var frames = frame.frames;
- // If the frame document exists
- if(frame.document)
+ // Try to access the frame document
+ try
{
- documents.push(frame.document);
+ // If the frame document exists
+ if(frame.document)
+ {
+ documents.push(frame.document);
+ }
+ }
+ catch(exception)
+ {
+ // Ignore
}
// Loop through the frames
Oops, something went wrong.

0 comments on commit 90b68a1

Please sign in to comment.