diff --git a/src/ng/browser.js b/src/ng/browser.js index 3ca4a7c0a86c..a7e3ebc6a88f 100644 --- a/src/ng/browser.js +++ b/src/ng/browser.js @@ -158,8 +158,6 @@ function Browser(window, document, $log, $sniffer) { if (replace) history.replaceState(null, '', url); else { history.pushState(null, '', url); - // Crazy Opera Bug: http://my.opera.com/community/forums/topic.dml?id=1185462 - baseElement.attr('href', baseElement.attr('href')); } } else { newLocation = url; diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js index 8bb93c56ceec..6700507efe41 100644 --- a/src/ng/directive/select.js +++ b/src/ng/directive/select.js @@ -633,11 +633,7 @@ var optionDirective = ['$interpolate', function($interpolate) { selectCtrl = parent.data(selectCtrlName) || parent.parent().data(selectCtrlName); // in case we are in optgroup - if (selectCtrl && selectCtrl.databound) { - // For some reason Opera defaults to true and if not overridden this messes up the repeater. - // We don't want the view to drive the initialization of the model anyway. - element.prop('selected', false); - } else { + if (!selectCtrl || !selectCtrl.databound) { selectCtrl = nullSelectCtrl; } diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js index b50423f0c9b3..3b6d3121f611 100644 --- a/test/ng/snifferSpec.js +++ b/test/ng/snifferSpec.js @@ -107,9 +107,6 @@ describe('$sniffer', function() { else if(/ie/i.test(ua) || /trident/i.test(ua)) { expectedPrefix = 'Ms'; } - else if(/opera/i.test(ua)) { - expectedPrefix = 'O'; - } expect($sniffer.vendorPrefix).toBe(expectedPrefix); }); });