Permalink
Browse files

Rebuilding for fixes to the improper merge

  • Loading branch information...
1 parent 3ebe92c commit a2ca7967a00e44eecd483ddeead3e03446a147da Dean Sofer committed Oct 30, 2012
Showing with 14 additions and 176 deletions.
  1. +6 −6 build/angular-ui-ieshiv.js
  2. +2 −2 build/angular-ui-ieshiv.min.js
  3. +4 −166 build/angular-ui.js
  4. +2 −2 build/angular-ui.min.js
View
@@ -1,6 +1,6 @@
/**
* AngularUI - The companion suite for AngularJS
- * @version v0.2.1 - 2012-10-28
+ * @version v0.3.0 - 2012-10-30
* @link http://angular-ui.github.com
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
@@ -23,9 +23,9 @@
var debug = window.ieShivDebug || false,
tags = [ "ngInclude", "ngPluralize", "ngView", "ngSwitch", "uiCurrency", "uiCodemirror", "uiDate", "uiEvent",
- "uiKeypress", "uiMask", "uiMapInfoWindow", "uiMapMarker", "uiMapPolyline", "uiMapPolygon", "uiMapRectangle",
- "uiMapCircle", "uiMapGroundOverlay", "uiModal", "uiReset", "uiScrollfix", "uiSelect2", "uiShow", "uiHide",
- "uiToggle", "uiSortable", "uiTinymce", "accordion", "accordionGroup", "modal", "tabs", "pane"
+ "uiKeypress", "uiKeyup", "uiKeydown", "uiMask", "uiMapInfoWindow", "uiMapMarker", "uiMapPolyline",
+ "uiMapPolygon", "uiMapRectangle", "uiMapCircle", "uiMapGroundOverlay", "uiModal", "uiReset",
+ "uiScrollfix", "uiSelect2", "uiShow", "uiHide", "uiToggle", "uiSortable", "uiTinymce"
];
window.myCustomTags = window.myCustomTags || []; // externally defined by developer using angular-ui directives
@@ -37,8 +37,8 @@
var rv = -1; // Return value assumes failure.
if (navigator.appName == 'Microsoft Internet Explorer') {
var ua = navigator.userAgent;
- var re = new RegExp("MSIE ([0-9]{1,}[\.0-9]{0,})");
- if (re.exec(ua) != null) {
+ var re = new RegExp("MSIE ([0-9]{1,}[\\.0-9]{0,})");
+ if (re.exec(ua) !== null) {
rv = parseFloat(RegExp.$1);
}
}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1,6 +1,6 @@
/**
* AngularUI - The companion suite for AngularJS
- * @version v0.3.0 - 2012-10-29
+ * @version v0.3.0 - 2012-10-30
* @link http://angular-ui.github.com
* @license MIT License, http://www.opensource.org/licenses/MIT
*/
@@ -360,59 +360,6 @@ angular.module('ui.directives')
return directive;
}]);
-'use strict';
-
-angular.module('ui.directives')
- .directive('uiDropdownToggle', ['ui.config', '$document', '$location', '$window',
- function (uiConfig, $document, $location, $window) {
-
- var options = { }, openElement = null, close;
- if (uiConfig.dropdownToggle) {
- angular.extend(options, uiConfig.dropdownToggle);
- }
- return {
- restrict: 'C',
- link: function(scope, element, attrs) {
-
- scope.$watch(function(){return $location.path();}, function() {
- close && close();
- });
-
- element.parent().bind('click', function(event) {
- close && close();
- });
-
- element.bind('click', function(event) {
- event.preventDefault();
- event.stopPropagation();
-
- var iWasOpen = false;
-
- // Initially, openElement will not have been defined, this code will not execute
- if (openElement) {
- iWasOpen = openElement === element;
- close();
- }
-
- if (!iWasOpen){
- element.parent().addClass('open');
- openElement = element;
-
- close = function (event) {
- event && event.preventDefault();
- event && event.stopPropagation();
- $document.unbind('click', close);
- element.parent().removeClass('open');
- close = null;
- openElement = null;
- }
-
- $document.bind('click', close);
- }
- });
- }
- };
- }]);
/**
* General-purpose Event binding. Bind any event not natively supported by Angular
* Pass an object with keynames for events to ui-event
@@ -814,6 +761,9 @@ angular.module('ui.directives')
link: function(scope, elm, attrs, model) {
//helper so you don't have to type class="modal hide"
elm.addClass('modal hide');
+ elm.on( 'shown', function() {
+ elm.find( "[autofocus]" ).focus();
+ });
scope.$watch(attrs.ngModel, function(value) {
elm.modal(value && 'show' || 'hide');
});
@@ -1122,118 +1072,6 @@ angular.module('ui.directives').directive('uiSortable', [
}
]);
-'use strict';
-
-angular.module('ui.directives')
-.directive('tabbable', ['ui.config', function (uiConfig) {
- var options = { }, openElement = null, close;
- if (uiConfig.tabbable) {
- angular.extend(options, uiConfig.tabbable);
- }
- return {
- restrict: 'C',
- compile: function(element) {
- var navTabs = angular.element('<ul class="nav nav-tabs"></ul>'),
- tabContent = angular.element('<div class="tab-content"></div>');
-
- tabContent.append(element.contents());
- element.append(navTabs).append(tabContent);
- },
- controller: ['$scope', '$element', function($scope, $element) {
- var navTabs = $element.contents().eq(0),
- ngModel = $element.controller('ngModel') || {},
- tabs = [],
- selectedTab;
-
- ngModel.$render = function() {
- var $viewValue = this.$viewValue;
-
- if (selectedTab ? (selectedTab.value != $viewValue) : $viewValue) {
- if(selectedTab) {
- selectedTab.paneElement.removeClass('active');
- selectedTab.tabElement.removeClass('active');
- selectedTab = null;
- }
- if($viewValue) {
- for(var i = 0, ii = tabs.length; i < ii; i++) {
- if ($viewValue == tabs[i].value) {
- selectedTab = tabs[i];
- break;
- }
- }
- if (selectedTab) {
- selectedTab.paneElement.addClass('active');
- selectedTab.tabElement.addClass('active');
- }
- }
-
- }
- };
-
- this.addPane = function(element, attr) {
- var li = angular.element('<li><a href></a></li>'),
- a = li.find('a'),
- tab = {
- paneElement: element,
- paneAttrs: attr,
- tabElement: li
- };
-
- tabs.push(tab);
-
- attr.$observe('value', update)();
- attr.$observe('title', function(){ update(); a.text(tab.title); })();
-
- function update() {
- tab.title = attr.title;
- tab.value = attr.value || attr.title;
- if (!ngModel.$setViewValue && (!ngModel.$viewValue || tab == selectedTab)) {
- // we are not part of angular
- ngModel.$viewValue = tab.value;
- }
- ngModel.$render();
- }
- navTabs.append(li);
- li.bind('click', function(event) {
- event.preventDefault();
- event.stopPropagation();
- if (ngModel.$setViewValue) {
- $scope.$apply(function() {
- ngModel.$setViewValue(tab.value);
- ngModel.$render();
- });
- } else {
- // we are not part of angular
- ngModel.$viewValue = tab.value;
- ngModel.$render();
- }
- });
- return function() {
- tab.tabElement.remove();
- for(var i = 0, ii = tabs.length; i < ii; i++ ) {
- if (tab == tabs[i]) {
- tabs.splice(i, 1);
- }
- }
- };
- }
- }]
- };
-}])
-.directive('tabPane', ['ui.config', function (uiConfig) {
- var options = { }, openElement = null, close;
- if (uiConfig.tabPane) {
- angular.extend(options, uiConfig.tabPane);
- }
- return {
- require: '^tabbable',
- restrict: 'C',
- replace: true,
- link: function(scope, element, attrs, tabsCtrl) {
- element.bind('$remove', tabsCtrl.addPane(element, attrs));
- }
- };
-}]);
/**
* Binds a TinyMCE widget to <textarea> elements.
*/
Oops, something went wrong.

0 comments on commit a2ca796

Please sign in to comment.