angular-ui-rails 0.3.2 → 0.4.0

data/lib/angular-ui-rails.rb

@@ -3,6 +3,12 @@ require "angular-ui-rails/version"
 module AngularUI
   module Rails
     class Engine < ::Rails::Engine
+      # Enabling assets precompiling under rails 3.1
+      if Rails.version >= '3.1'
+        initializer :assets do |config|
+          Rails.application.config.assets.precompile += %w( angular-ui-ieshiv.js )
+        end
+      end
     end
   end
-end
+end

data/lib/angular-ui-rails/version.rb

@@ -1,5 +1,5 @@
 module AngularUI
   module Rails
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/vendor/assets/javascripts/angular-ui-ieshiv.js

@@ -1,6 +1,6 @@
 /**
  * AngularUI - The companion suite for AngularJS
- * @version v0.3.2 - 2012-12-04
+ * @version v0.4.0 - 2013-02-15
  * @link http://angular-ui.github.com
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
@@ -31,21 +31,7 @@
   window.myCustomTags =  window.myCustomTags || []; // externally defined by developer using angular-ui directives
   tags.push.apply(tags, window.myCustomTags);
 
-  var getIE = function () {
-    // Returns the version of Internet Explorer or a -1
-    // (indicating the use of another browser).
-    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) {
-        rv = parseFloat(RegExp.$1);
-      }
-    }
-    return rv;
-  };
-
-  var toCustomElements = function (str, delim) {
+  var toCustomElements = function (str) {
     var result = [];
     var dashed = str.replace(/([A-Z])/g, function ($1) {
       return " " + $1.toLowerCase();
@@ -62,20 +48,12 @@
     return result;
   };
 
-  var shiv = function () {
-    for (var i = 0, tlen = tags.length; i < tlen; i++) {
-      var customElements = toCustomElements(tags[i], ':');
-      for (var j = 0, clen = customElements.length; j < clen; j++) {
-        var customElement = customElements[j];
-        document.createElement(customElement);
-      }
+  for (var i = 0, tlen = tags.length; i < tlen; i++) {
+    var customElements = toCustomElements(tags[i]);
+    for (var j = 0, clen = customElements.length; j < clen; j++) {
+      var customElement = customElements[j];
+      document.createElement(customElement);
     }
-  };
-
-  var ieVersion = getIE();
-
-  if ((ieVersion > -1 && ieVersion < 9) || debug) {
-    shiv();
   }
 
 })(window);

data/vendor/assets/javascripts/angular-ui.js

@@ -1,6 +1,6 @@
 /**
  * AngularUI - The companion suite for AngularJS
- * @version v0.3.2 - 2012-12-04
+ * @version v0.4.0 - 2013-02-15
  * @link http://angular-ui.github.com
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
@@ -11,106 +11,343 @@ angular.module('ui.filters', ['ui.config']);
 angular.module('ui.directives', ['ui.config']);
 angular.module('ui', ['ui.filters', 'ui.directives', 'ui.config']);
 
-/*
- jQuery UI Sortable plugin wrapper
+/**
+ * Animates the injection of new DOM elements by simply creating the DOM with a class and then immediately removing it
+ * Animations must be done using CSS3 transitions, but provide excellent flexibility
+ *
+ * @todo Add proper support for animating out
+ * @param [options] {mixed} Can be an object with multiple options, or a string with the animation class
+ *    class {string} the CSS class(es) to use. For example, 'ui-hide' might be an excellent alternative class.
+ * @example <li ng-repeat="item in items" ui-animate=" 'ui-hide' ">{{item}}</li>
+ */
+angular.module('ui.directives').directive('uiAnimate', ['ui.config', '$timeout', function (uiConfig, $timeout) {
+  var options = {};
+  if (angular.isString(uiConfig.animate)) {
+    options['class'] = uiConfig.animate;
+  } else if (uiConfig.animate) {
+    options = uiConfig.animate;
+  }
+  return {
+    restrict: 'A', // supports using directive as element, attribute and class
+    link: function ($scope, element, attrs) {
+      var opts = {};
+      if (attrs.uiAnimate) {
+        opts = $scope.$eval(attrs.uiAnimate);
+        if (angular.isString(opts)) {
+          opts = {'class': opts};
+        }
+      }
+      opts = angular.extend({'class': 'ui-animate'}, options, opts);
 
- @param [ui-sortable] {object} Options to pass to $.fn.sortable() merged onto ui.config
+      element.addClass(opts['class']);
+      $timeout(function () {
+        element.removeClass(opts['class']);
+      }, 20, false);
+    }
+  };
+}]);
+
+
+/*
+*  AngularJs Fullcalendar Wrapper for the JQuery FullCalendar
+*  API @ http://arshaw.com/fullcalendar/ 
+*  
+*  Angular Calendar Directive that takes in the [eventSources] nested array object as the ng-model and watches (eventSources.length + eventSources[i].length) for changes. 
+*       Can also take in multiple event urls as a source object(s) and feed the events per view.
+*       The calendar will watch any eventSource array and update itself when a delta is created  
+*       An equalsTracker attrs has been added for use cases that would render the overall length tracker the same even though the events have changed to force updates.
+*
 */
 
-angular.module('ui.directives').directive('uiSortable', [
-  'ui.config', function(uiConfig) {
-    var options;
-    options = {};
-    if (uiConfig.sortable != null) {
-      angular.extend(options, uiConfig.sortable);
-    }
-    return {
-      require: '?ngModel',
-      link: function(scope, element, attrs, ngModel) {
-        var onStart, onUpdate, opts, _start, _update;
-        opts = angular.extend({}, options, scope.$eval(attrs.uiOptions));
-        if (ngModel != null) {
-          onStart = function(e, ui) {
-            return ui.item.data('ui-sortable-start', ui.item.index());
-          };
-          onUpdate = function(e, ui) {
-            var end, start;
-            start = ui.item.data('ui-sortable-start');
-            end = ui.item.index();
-            ngModel.$modelValue.splice(end, 0, ngModel.$modelValue.splice(start, 1)[0]);
-            return scope.$apply();
-          };
-          _start = opts.start;
-          opts.start = function(e, ui) {
-            onStart(e, ui);
-            if (typeof _start === "function") {
-              _start(e, ui);
-            }
-            return scope.$apply();
-          };
-          _update = opts.update;
-          opts.update = function(e, ui) {
-            onUpdate(e, ui);
-            if (typeof _update === "function") {
-              _update(e, ui);
+angular.module('ui.directives').directive('uiCalendar',['ui.config', '$parse', function (uiConfig,$parse) {
+     uiConfig.uiCalendar = uiConfig.uiCalendar || {};       
+     //returns calendar     
+     return {
+        require: 'ngModel',
+        restrict: 'A',
+          link: function(scope, elm, attrs, $timeout) {
+            var sources = scope.$eval(attrs.ngModel);
+            var tracker = 0;
+            /* returns the length of all source arrays plus the length of eventSource itself */
+            var getSources = function () {
+              var equalsTracker = scope.$eval(attrs.equalsTracker);
+              tracker = 0;
+              angular.forEach(sources,function(value,key){
+                if(angular.isArray(value)){
+                  tracker += value.length;
+                }
+              });
+               if(angular.isNumber(equalsTracker)){
+                return tracker + sources.length + equalsTracker;
+               }else{
+                return tracker + sources.length;
+              }
+            };
+            /* update the calendar with the correct options */
+            function update() {
+              //calendar object exposed on scope
+              scope.calendar = elm.html('');
+              var view = scope.calendar.fullCalendar('getView');
+              if(view){
+                view = view.name; //setting the default view to be whatever the current view is. This can be overwritten. 
+              }
+              /* If the calendar has options added then render them */
+              var expression,
+                options = {
+                  defaultView : view,
+                  eventSources: sources
+                };
+              if (attrs.uiCalendar) {
+                expression = scope.$eval(attrs.uiCalendar);
+              } else {
+                expression = {};
+              }
+              angular.extend(options, uiConfig.uiCalendar, expression);
+              scope.calendar.fullCalendar(options);
             }
-            return scope.$apply();
-          };
-        }
-        return element.sortable(opts);
-      }
+            update();
+              /* watches all eventSources */
+              scope.$watch(getSources, function( newVal, oldVal )
+              {
+                update();
+              });
+         }
     };
-  }
-]);
-
+}]);
+/*global angular, CodeMirror, Error*/
 /**
- * General-purpose jQuery wrapper. Simply pass the plugin name as the expression.
- *
- * It is possible to specify a default set of parameters for each jQuery plugin.
- * Under the jq key, namespace each plugin by that which will be passed to ui-jq.
- * Unfortunately, at this time you can only pre-define the first parameter.
- * @example { jq : { datepicker : { showOn:'click' } } }
- *
- * @param ui-jq {string} The $elm.[pluginName]() to call.
- * @param [ui-options] {mixed} Expression to be evaluated and passed as options to the function
- *     Multiple parameters can be separated by commas
- *    Set {ngChange:false} to disable passthrough support for change events ( since angular watches 'input' events, not 'change' events )
- *
- * @example <input ui-jq="datepicker" ui-options="{showOn:'click'},secondParameter,thirdParameter">
+ * Binds a CodeMirror widget to a <textarea> element.
+ */
+angular.module('ui.directives').directive('uiCodemirror', ['ui.config', '$timeout', function (uiConfig, $timeout) {
+	'use strict';
+
+	var events = ["cursorActivity", "viewportChange", "gutterClick", "focus", "blur", "scroll", "update"];
+	return {
+		restrict:'A',
+		require:'ngModel',
+		link:function (scope, elm, attrs, ngModel) {
+			var options, opts, onChange, deferCodeMirror, codeMirror;
+
+			if (elm[0].type !== 'textarea') {
+				throw new Error('uiCodemirror3 can only be applied to a textarea element');
+			}
+
+			options = uiConfig.codemirror || {};
+			opts = angular.extend({}, options, scope.$eval(attrs.uiCodemirror));
+
+			onChange = function (aEvent) {
+				return function (instance, changeObj) {
+					var newValue = instance.getValue();
+					if (newValue !== ngModel.$viewValue) {
+						ngModel.$setViewValue(newValue);
+						scope.$apply();
+					}
+					if (typeof aEvent === "function")
+						aEvent(instance, changeObj);
+				};
+			};
+
+			deferCodeMirror = function () {
+				codeMirror = CodeMirror.fromTextArea(elm[0], opts);
+				codeMirror.on("change", onChange(opts.onChange));
+
+				for (var i = 0, n = events.length, aEvent; i < n; ++i) {
+					aEvent = opts["on" + events[i].charAt(0).toUpperCase() + events[i].slice(1)];
+					if (aEvent === void 0) continue;
+					if (typeof aEvent !== "function") continue;
+					codeMirror.on(events[i], aEvent);
+				}
+
+				// CodeMirror expects a string, so make sure it gets one.
+				// This does not change the model.
+				ngModel.$formatters.push(function (value) {
+					if (angular.isUndefined(value) || value === null) {
+						return '';
+					}
+					else if (angular.isObject(value) || angular.isArray(value)) {
+						throw new Error('ui-codemirror cannot use an object or an array as a model');
+					}
+					return value;
+				});
+
+				// Override the ngModelController $render method, which is what gets called when the model is updated.
+				// This takes care of the synchronizing the codeMirror element with the underlying model, in the case that it is changed by something else.
+				ngModel.$render = function () {
+					codeMirror.setValue(ngModel.$viewValue);
+				};
+
+				// Watch ui-refresh and refresh the directive
+				if (attrs.uiRefresh) {
+					scope.$watch(attrs.uiRefresh, function(newVal, oldVal){
+						// Skip the initial watch firing
+						if (newVal !== oldVal)
+							$timeout(codeMirror.refresh);
+					});
+				}
+			};
+
+			$timeout(deferCodeMirror);
+
+		}
+	};
+}]);
+
+/*
+ Gives the ability to style currency based on its sign.
  */
-angular.module('ui.directives').directive('uiJq', ['ui.config', function (uiConfig) {
+angular.module('ui.directives').directive('uiCurrency', ['ui.config', 'currencyFilter' , function (uiConfig, currencyFilter) {
+  var options = {
+    pos: 'ui-currency-pos',
+    neg: 'ui-currency-neg',
+    zero: 'ui-currency-zero'
+  };
+  if (uiConfig.currency) {
+    angular.extend(options, uiConfig.currency);
+  }
   return {
-    restrict: 'A',
-    compile: function (tElm, tAttrs) {
-      if (!angular.isFunction(tElm[tAttrs.uiJq])) {
-        throw new Error('ui-jq: The "' + tAttrs.uiJq + '" function does not exist');
-      }
-      var options = uiConfig.jq && uiConfig.jq[tAttrs.uiJq];
-      return function (scope, elm, attrs) {
-        var linkOptions = [], ngChange = 'change';
+    restrict: 'EAC',
+    require: 'ngModel',
+    link: function (scope, element, attrs, controller) {
+      var opts, // instance-specific options
+        renderview,
+        value;
 
-        if (attrs.uiOptions) {
-          linkOptions = scope.$eval('[' + attrs.uiOptions + ']');
-          if (angular.isObject(options) && angular.isObject(linkOptions[0])) {
-            linkOptions[0] = angular.extend(options, linkOptions[0]);
-          }
-        } else if (options) {
-          linkOptions = [options];
+      opts = angular.extend({}, options, scope.$eval(attrs.uiCurrency));
+
+      renderview = function (viewvalue) {
+        var num;
+        num = viewvalue * 1;
+        element.toggleClass(opts.pos, (num > 0) );
+        element.toggleClass(opts.neg, (num < 0) );
+        element.toggleClass(opts.zero, (num === 0) );
+        if (viewvalue === '') {
+          element.text('');
+        } else {
+          element.text(currencyFilter(num, opts.symbol));
         }
-        if (attrs.ngModel && elm.is('select,input,textarea')) {
-          if (linkOptions && angular.isObject(linkOptions[0]) && linkOptions[0].ngChange !== undefined) {
-            ngChange = linkOptions[0].ngChange;
-          }
-          if (ngChange) {
-            elm.on(ngChange, function () {
-              elm.trigger('input');
+        return true;
+      };
+
+      controller.$render = function () {
+        value = controller.$viewValue;
+        element.val(value);
+        renderview(value);
+      };
+
+    }
+  };
+}]);
+
+/*global angular */
+/*
+ jQuery UI Datepicker plugin wrapper
+
+ @note If ≤ IE8 make sure you have a polyfill for Date.toISOString()
+ @param [ui-date] {object} Options to pass to $.fn.datepicker() merged onto ui.config
+ */
+
+angular.module('ui.directives')
+
+.directive('uiDate', ['ui.config', function (uiConfig) {
+  'use strict';
+  var options;
+  options = {};
+  if (angular.isObject(uiConfig.date)) {
+    angular.extend(options, uiConfig.date);
+  }
+  return {
+    require:'?ngModel',
+    link:function (scope, element, attrs, controller) {
+      var getOptions = function () {
+        return angular.extend({}, uiConfig.date, scope.$eval(attrs.uiDate));
+      };
+      var initDateWidget = function () {
+        var opts = getOptions();
+
+        // If we have a controller (i.e. ngModelController) then wire it up
+        if (controller) {
+          var updateModel = function () {
+            scope.$apply(function () {
+              var date = element.datepicker("getDate");
+              element.datepicker("setDate", element.val());
+              controller.$setViewValue(date);
+              element.blur();
             });
+          };
+          if (opts.onSelect) {
+            // Caller has specified onSelect, so call this as well as updating the model
+            var userHandler = opts.onSelect;
+            opts.onSelect = function (value, picker) {
+              updateModel();
+              scope.$apply(function() {
+                userHandler(value, picker);
+              });
+            };
+          } else {
+            // No onSelect already specified so just update the model
+            opts.onSelect = updateModel;
           }
+          // In case the user changes the text directly in the input box
+          element.bind('change', updateModel);
+
+          // Update the date picker when the model changes
+          controller.$render = function () {
+            var date = controller.$viewValue;
+            if ( angular.isDefined(date) && date !== null && !angular.isDate(date) ) {
+              throw new Error('ng-Model value must be a Date object - currently it is a ' + typeof date + ' - use ui-date-format to convert it from a string');
+            }
+            element.datepicker("setDate", date);
+          };
+        }
+        // If we don't destroy the old one it doesn't update properly when the config changes
+        element.datepicker('destroy');
+        // Create the new datepicker widget
+        element.datepicker(opts);
+        if ( controller ) {
+          // Force a render to override whatever is in the input text box
+          controller.$render();
         }
-        elm[attrs.uiJq].apply(elm, linkOptions);
       };
+      // Watch for changes to the directives options
+      scope.$watch(getOptions, initDateWidget, true);
+    }
+  };
+}
+])
+
+.directive('uiDateFormat', ['ui.config', function(uiConfig) {
+  var directive = {
+    require:'ngModel',
+    link: function(scope, element, attrs, modelCtrl) {
+      var dateFormat = attrs.uiDateFormat || uiConfig.dateFormat;
+      if ( dateFormat ) {
+        // Use the datepicker with the attribute value as the dateFormat string to convert to and from a string
+        modelCtrl.$formatters.push(function(value) {
+          if (angular.isString(value) ) {
+            return $.datepicker.parseDate(dateFormat, value);
+          }
+        });
+        modelCtrl.$parsers.push(function(value){
+          if (value) {
+            return $.datepicker.formatDate(dateFormat, value);
+          }
+        });
+      } else {
+        // Default to ISO formatting
+        modelCtrl.$formatters.push(function(value) {
+          if (angular.isString(value) ) {
+            return new Date(value);
+          }
+        });
+        modelCtrl.$parsers.push(function(value){
+          if (value) {
+            return value.toISOString();
+          }
+        });
+      }
     }
   };
+  return directive;
 }]);
 
 /**
@@ -142,99 +379,219 @@ angular.module('ui.directives').directive('uiEvent', ['$parse',
   }]);
 
 /*
- Attaches jquery-ui input mask onto input element
+ * Defines the ui-if tag. This removes/adds an element from the dom depending on a condition
+ * Originally created by @tigbro, for the @jquery-mobile-angular-adapter
+ * https://github.com/tigbro/jquery-mobile-angular-adapter
  */
-angular.module('ui.directives').directive('uiMask', [
-  function () {
-    return {
-      require:'ngModel',
-      link:function ($scope, element, attrs, controller) {
-
-        /* We override the render method to run the jQuery mask plugin
-         */
-        controller.$render = function () {
-          var value = controller.$viewValue || '';
-          element.val(value);
-          element.mask($scope.$eval(attrs.uiMask));
-        };
+angular.module('ui.directives').directive('uiIf', [function () {
+  return {
+    transclude: 'element',
+    priority: 1000,
+    terminal: true,
+    restrict: 'A',
+    compile: function (element, attr, transclude) {
+      return function (scope, element, attr) {
+
+        var childElement;
+        var childScope;
+ 
+        scope.$watch(attr['uiIf'], function (newValue) {
+          if (childElement) {
+            childElement.remove();
+            childElement = undefined;
+          }
+          if (childScope) {
+            childScope.$destroy();
+            childScope = undefined;
+          }
 
-        /* Add a parser that extracts the masked value into the model but only if the mask is valid
-         */
-        controller.$parsers.push(function (value) {
-          //the second check (or) is only needed due to the fact that element.isMaskValid() will keep returning undefined
-          //until there was at least one key event
-          var isValid = element.isMaskValid() || angular.isUndefined(element.isMaskValid()) && element.val().length>0;
-          controller.$setValidity('mask', isValid);
-          return isValid ? value : undefined;
+          if (newValue) {
+            childScope = scope.$new();
+            transclude(childScope, function (clone) {
+              childElement = clone;
+              element.after(clone);
+            });
+          }
         });
+      };
+    }
+  };
+}]);
+/**
+ * General-purpose jQuery wrapper. Simply pass the plugin name as the expression.
+ *
+ * It is possible to specify a default set of parameters for each jQuery plugin.
+ * Under the jq key, namespace each plugin by that which will be passed to ui-jq.
+ * Unfortunately, at this time you can only pre-define the first parameter.
+ * @example { jq : { datepicker : { showOn:'click' } } }
+ *
+ * @param ui-jq {string} The $elm.[pluginName]() to call.
+ * @param [ui-options] {mixed} Expression to be evaluated and passed as options to the function
+ *     Multiple parameters can be separated by commas
+ * @param [ui-refresh] {expression} Watch expression and refire plugin on changes
+ *
+ * @example <input ui-jq="datepicker" ui-options="{showOn:'click'},secondParameter,thirdParameter" ui-refresh="iChange">
+ */
+angular.module('ui.directives').directive('uiJq', ['ui.config', '$timeout', function uiJqInjectingFunction(uiConfig, $timeout) {
 
-        /* When keyup, update the view value
-         */
-        element.bind('keyup', function () {
-          $scope.$apply(function () {
-            controller.$setViewValue(element.mask());
-          });
-        });
+  return {
+    restrict: 'A',
+    compile: function uiJqCompilingFunction(tElm, tAttrs) {
+
+      if (!angular.isFunction(tElm[tAttrs.uiJq])) {
+        throw new Error('ui-jq: The "' + tAttrs.uiJq + '" function does not exist');
       }
-    };
-  }
-]);
+      var options = uiConfig.jq && uiConfig.jq[tAttrs.uiJq];
 
-angular.module('ui.directives')
-.directive('uiModal', ['$timeout', function($timeout) {
-  return {
-    restrict: 'EAC',
-    require: 'ngModel',
-    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');
-      });
-      //If bootstrap animations are enabled, listen to 'shown' and 'hidden' events
-      elm.on(jQuery.support.transition && 'shown' || 'show', function() {
-        $timeout(function() {
-          model.$setViewValue(true);
+      return function uiJqLinkingFunction(scope, elm, attrs) {
+
+        var linkOptions = [];
+
+        // If ui-options are passed, merge (or override) them onto global defaults and pass to the jQuery method
+        if (attrs.uiOptions) {
+          linkOptions = scope.$eval('[' + attrs.uiOptions + ']');
+          if (angular.isObject(options) && angular.isObject(linkOptions[0])) {
+            linkOptions[0] = angular.extend({}, options, linkOptions[0]);
+          }
+        } else if (options) {
+          linkOptions = [options];
+        }
+        // If change compatibility is enabled, the form input's "change" event will trigger an "input" event
+        if (attrs.ngModel && elm.is('select,input,textarea')) {
+          elm.on('change', function() {
+            elm.trigger('input');
+          });
+        }
+
+        // Call jQuery method and pass relevant options
+        function callPlugin() {
+          $timeout(function() {
+            elm[attrs.uiJq].apply(elm, linkOptions);
+          }, 0, false);
+        }
+
+        // If ui-refresh is used, re-fire the the method upon every change
+        if (attrs.uiRefresh) {
+          scope.$watch(attrs.uiRefresh, function(newVal) {
+            callPlugin();
+          });
+        }
+        callPlugin();
+      };
+    }
+  };
+}]);
+
+angular.module('ui.directives').factory('keypressHelper', ['$parse', function keypress($parse){
+  var keysByCode = {
+    8: 'backspace',
+    9: 'tab',
+    13: 'enter',
+    27: 'esc',
+    32: 'space',
+    33: 'pageup',
+    34: 'pagedown',
+    35: 'end',
+    36: 'home',
+    37: 'left',
+    38: 'up',
+    39: 'right',
+    40: 'down',
+    45: 'insert',
+    46: 'delete'
+  };
+
+  var capitaliseFirstLetter = function (string) {
+    return string.charAt(0).toUpperCase() + string.slice(1);
+  };
+
+  return function(mode, scope, elm, attrs) {
+    var params, combinations = [];
+    params = scope.$eval(attrs['ui'+capitaliseFirstLetter(mode)]);
+
+    // Prepare combinations for simple checking
+    angular.forEach(params, function (v, k) {
+      var combination, expression;
+      expression = $parse(v);
+
+      angular.forEach(k.split(' '), function(variation) {
+        combination = {
+          expression: expression,
+          keys: {}
+        };
+        angular.forEach(variation.split('-'), function (value) {
+          combination.keys[value] = true;
         });
+        combinations.push(combination);
       });
-      elm.on(jQuery.support.transition && 'hidden' || 'hide', function() {
-        $timeout(function() {
-          model.$setViewValue(false);
-        });
+    });
+
+    // Check only matching of pressed keys one of the conditions
+    elm.bind(mode, function (event) {
+      // No need to do that inside the cycle
+      var altPressed = event.metaKey || event.altKey;
+      var ctrlPressed = event.ctrlKey;
+      var shiftPressed = event.shiftKey;
+      var keyCode = event.keyCode;
+
+      // normalize keycodes
+      if (mode === 'keypress' && !shiftPressed && keyCode >= 97 && keyCode <= 122) {
+        keyCode = keyCode - 32;
+      }
+
+      // Iterate over prepared combinations
+      angular.forEach(combinations, function (combination) {
+
+        var mainKeyPressed = (combination.keys[keysByCode[event.keyCode]] || combination.keys[event.keyCode.toString()]) || false;
+
+        var altRequired = combination.keys.alt || false;
+        var ctrlRequired = combination.keys.ctrl || false;
+        var shiftRequired = combination.keys.shift || false;
+
+        if (
+          mainKeyPressed &&
+          ( altRequired == altPressed ) &&
+          ( ctrlRequired == ctrlPressed ) &&
+          ( shiftRequired == shiftPressed )
+        ) {
+          // Run the function
+          scope.$apply(function () {
+            combination.expression(scope, { '$event': event });
+          });
+        }
       });
-    }
+    });
   };
 }]);
+
 /**
- * Add a clear button to form inputs to reset their value
- */
-angular.module('ui.directives').directive('uiReset', ['ui.config', function (uiConfig) {
-  var resetValue = null;
-  if (uiConfig.reset !== undefined)
-      resetValue = uiConfig.reset;
+ * Bind one or more handlers to particular keys or their combination
+ * @param hash {mixed} keyBindings Can be an object or string where keybinding expression of keys or keys combinations and AngularJS Exspressions are set. Object syntax: "{ keys1: expression1 [, keys2: expression2 [ , ... ]]}". String syntax: ""expression1 on keys1 [ and expression2 on keys2 [ and ... ]]"". Expression is an AngularJS Expression, and key(s) are dash-separated combinations of keys and modifiers (one or many, if any. Order does not matter). Supported modifiers are 'ctrl', 'shift', 'alt' and key can be used either via its keyCode (13 for Return) or name. Named keys are 'backspace', 'tab', 'enter', 'esc', 'space', 'pageup', 'pagedown', 'end', 'home', 'left', 'up', 'right', 'down', 'insert', 'delete'.
+ * @example <input ui-keypress="{enter:'x = 1', 'ctrl-shift-space':'foo()', 'shift-13':'bar()'}" /> <input ui-keypress="foo = 2 on ctrl-13 and bar('hello') on shift-esc" />
+ **/
+angular.module('ui.directives').directive('uiKeydown', ['keypressHelper', function(keypressHelper){
   return {
-    require: 'ngModel',
-    link: function (scope, elm, attrs, ctrl) {
-      var aElement;
-      aElement = angular.element('<a class="ui-reset" />');
-      elm.wrap('<span class="ui-resetwrap" />').after(aElement);
-      aElement.bind('click', function (e) {
-        e.preventDefault();
-        scope.$apply(function () {
-          if (attrs.uiReset)
-            ctrl.$setViewValue(scope.$eval(attrs.uiReset));
-          else
-            ctrl.$setViewValue(resetValue);
-          ctrl.$render();
-        });
-      });
+    link: function (scope, elm, attrs) {
+      keypressHelper('keydown', scope, elm, attrs);
+    }
+  };
+}]);
+
+angular.module('ui.directives').directive('uiKeypress', ['keypressHelper', function(keypressHelper){
+  return {
+    link: function (scope, elm, attrs) {
+      keypressHelper('keypress', scope, elm, attrs);
     }
   };
 }]);
 
+angular.module('ui.directives').directive('uiKeyup', ['keypressHelper', function(keypressHelper){
+  return {
+    link: function (scope, elm, attrs) {
+      keypressHelper('keyup', scope, elm, attrs);
+    }
+  };
+}]);
 (function () {
   var app = angular.module('ui.directives');
 
@@ -246,7 +603,7 @@ angular.module('ui.directives').directive('uiReset', ['ui.config', function (uiC
       //for the googlemap doesn't interfere with a normal 'click' event
       var $event = { type: 'map-' + eventName };
       google.maps.event.addListener(googleObject, eventName, function (evt) {
-        element.trigger(angular.extend({}, $event, evt));
+        element.triggerHandler(angular.extend({}, $event, evt));
         //We create an $apply if it isn't happening. we need better support for this
         //We don't want to use timeout because tons of these events fire at once,
         //and we only need one $apply
@@ -360,485 +717,141 @@ angular.module('ui.directives').directive('uiReset', ['ui.config', function (uiC
     'click dblclick');
 
 })();
-angular.module('ui.directives').factory('keypressHelper', ['$parse', function keypress($parse){
-  var keysByCode = {
-    8: 'backspace',
-    9: 'tab',
-    13: 'enter',
-    27: 'esc',
-    32: 'space',
-    33: 'pageup',
-    34: 'pagedown',
-    35: 'end',
-    36: 'home',
-    37: 'left',
-    38: 'up',
-    39: 'right',
-    40: 'down',
-    45: 'insert',
-    46: 'delete'
-  };
-
-  var capitaliseFirstLetter = function (string) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-  };
-
-  return function(mode, scope, elm, attrs) {
-    var params, combinations = [];
-    params = scope.$eval(attrs['ui'+capitaliseFirstLetter(mode)]);
+/*
+ Attaches jquery-ui input mask onto input element
+ */
+angular.module('ui.directives').directive('uiMask', [
+  function () {
+    return {
+      require:'ngModel',
+      link:function ($scope, element, attrs, controller) {
 
-    // Prepare combinations for simple checking
-    angular.forEach(params, function (v, k) {
-      var combination, expression;
-      expression = $parse(v);
+        /* We override the render method to run the jQuery mask plugin
+         */
+        controller.$render = function () {
+          var value = controller.$viewValue || '';
+          element.val(value);
+          element.mask($scope.$eval(attrs.uiMask));
+        };
 
-      angular.forEach(k.split(' '), function(variation) {
-        combination = {
-          expression: expression,
-          keys: {}
-        };
-        angular.forEach(variation.split('-'), function (value) {
-          combination.keys[value] = true;
+        /* Add a parser that extracts the masked value into the model but only if the mask is valid
+         */
+        controller.$parsers.push(function (value) {
+          //the second check (or) is only needed due to the fact that element.isMaskValid() will keep returning undefined
+          //until there was at least one key event
+          var isValid = element.isMaskValid() || angular.isUndefined(element.isMaskValid()) && element.val().length>0;
+          controller.$setValidity('mask', isValid);
+          return isValid ? value : undefined;
         });
-        combinations.push(combination);
-      });
-    });
-
-    // Check only matching of pressed keys one of the conditions
-    elm.bind(mode, function (event) {
-      // No need to do that inside the cycle
-      var altPressed = event.metaKey || event.altKey;
-      var ctrlPressed = event.ctrlKey;
-      var shiftPressed = event.shiftKey;
-      var keyCode = event.keyCode;
-
-      // normalize keycodes
-      if (mode === 'keypress' && !shiftPressed && keyCode >= 97 && keyCode <= 122) {
-        keyCode = keyCode - 32;
-      }
 
-      // Iterate over prepared combinations
-      angular.forEach(combinations, function (combination) {
-
-        var mainKeyPressed = (combination.keys[keysByCode[event.keyCode]] || combination.keys[event.keyCode.toString()]) || false;
-
-        var altRequired = combination.keys.alt || false;
-        var ctrlRequired = combination.keys.ctrl || false;
-        var shiftRequired = combination.keys.shift || false;
-
-        if (
-          mainKeyPressed &&
-          ( altRequired == altPressed ) &&
-          ( ctrlRequired == ctrlPressed ) &&
-          ( shiftRequired == shiftPressed )
-        ) {
-          // Run the function
-          scope.$apply(function () {
-            combination.expression(scope, { '$event': event });
+        /* When keyup, update the view value
+         */
+        element.bind('keyup', function () {
+          $scope.$apply(function () {
+            controller.$setViewValue(element.mask());
           });
-        }
-      });
-    });
-  };
-}]);
-
-/**
- * Bind one or more handlers to particular keys or their combination
- * @param hash {mixed} keyBindings Can be an object or string where keybinding expression of keys or keys combinations and AngularJS Exspressions are set. Object syntax: "{ keys1: expression1 [, keys2: expression2 [ , ... ]]}". String syntax: ""expression1 on keys1 [ and expression2 on keys2 [ and ... ]]"". Expression is an AngularJS Expression, and key(s) are dash-separated combinations of keys and modifiers (one or many, if any. Order does not matter). Supported modifiers are 'ctrl', 'shift', 'alt' and key can be used either via its keyCode (13 for Return) or name. Named keys are 'backspace', 'tab', 'enter', 'esc', 'space', 'pageup', 'pagedown', 'end', 'home', 'left', 'up', 'right', 'down', 'insert', 'delete'.
- * @example <input ui-keypress="{enter:'x = 1', 'ctrl-shift-space':'foo()', 'shift-13':'bar()'}" /> <input ui-keypress="foo = 2 on ctrl-13 and bar('hello') on shift-esc" />
- **/
-angular.module('ui.directives').directive('uiKeydown', ['keypressHelper', function(keypressHelper){
-  return {
-    link: function (scope, elm, attrs) {
-      keypressHelper('keydown', scope, elm, attrs);
-    }
-  };
-}]);
-
-angular.module('ui.directives').directive('uiKeypress', ['keypressHelper', function(keypressHelper){
-  return {
-    link: function (scope, elm, attrs) {
-      keypressHelper('keypress', scope, elm, attrs);
-    }
-  };
-}]);
-
-angular.module('ui.directives').directive('uiKeyup', ['keypressHelper', function(keypressHelper){
-  return {
-    link: function (scope, elm, attrs) {
-      keypressHelper('keyup', scope, elm, attrs);
-    }
-  };
-}]);
-/**
- * General-purpose validator for ngModel.
- * angular.js comes with several built-in validation mechanism for input fields (ngRequired, ngPattern etc.) but using
- * an arbitrary validation function requires creation of a custom formatters and / or parsers.
- * The ui-validate directive makes it easy to use any function(s) defined in scope as a validator function(s).
- * A validator function will trigger validation on both model and input changes.
- *
- * @example <input ui-validate="myValidatorFunction">
- * @example <input ui-validate="{foo : validateFoo, bar : validateBar}">
- *
- * @param ui-validate {string|object literal} If strings is passed it should be a scope's function to be used as a validator.
- * If an object literal is passed a key denotes a validation error key while a value should be a validator function.
- * In both cases validator function should take a value to validate as its argument and should return true/false indicating a validation result.
- */
-angular.module('ui.directives').directive('uiValidate', function () {
-
-  return {
-    restrict: 'A',
-    require: 'ngModel',
-    link: function (scope, elm, attrs, ctrl) {
-
-      var validateFn, validateExpr = attrs.uiValidate;
-
-      validateExpr = scope.$eval(validateExpr);
-      if (!validateExpr) {
-        return;
-      }
-
-      if (angular.isFunction(validateExpr)) {
-        validateExpr = { validator: validateExpr };
-      }
-
-      angular.forEach(validateExpr, function (validatorFn, key) {
-        validateFn = function (valueToValidate) {
-          if (validatorFn(valueToValidate)) {
-            ctrl.$setValidity(key, true);
-            return valueToValidate;
-          } else {
-            ctrl.$setValidity(key, false);
-            return undefined;
-          }
-        };
-        ctrl.$formatters.push(validateFn);
-        ctrl.$parsers.push(validateFn);
-      });
-    }
-  };
-});
-/**
- * Animates the injection of new DOM elements by simply creating the DOM with a class and then immediately removing it
- * Animations must be done using CSS3 transitions, but provide excellent flexibility
- *
- * @todo Add proper support for animating out
- * @param [options] {mixed} Can be an object with multiple options, or a string with the animation class
- *    class {string} the CSS class(es) to use. For example, 'ui-hide' might be an excellent alternative class.
- * @example <li ng-repeat="item in items" ui-animate=" 'ui-hide' ">{{item}}</li>
- */
-angular.module('ui.directives').directive('uiAnimate', ['ui.config', '$timeout', function (uiConfig, $timeout) {
-  var options = {};
-  if (angular.isString(uiConfig.animate)) {
-    options['class'] = uiConfig.animate;
-  } else if (uiConfig.animate) {
-    options = uiConfig.animate;
-  }
-  return {
-    restrict: 'A', // supports using directive as element, attribute and class
-    link: function ($scope, element, attrs) {
-      var opts = {};
-      if (attrs.uiAnimate) {
-        opts = $scope.$eval(attrs.uiAnimate);
-        if (angular.isString(opts)) {
-          opts = {'class': opts};
-        }
-      }
-      opts = angular.extend({'class': 'ui-animate'}, options, opts);
-
-      element.addClass(opts['class']);
-      $timeout(function () {
-        element.removeClass(opts['class']);
-      }, 20, false);
-    }
-  };
-}]);
-
-
-/**
- * Enhanced Select2 Dropmenus
- *
- * @AJAX Mode - When in this mode, your value will be an object (or array of objects) of the data used by Select2
- *     This change is so that you do not have to do an additional query yourself on top of Select2's own query
- * @params [options] {object} The configuration options passed to $.fn.select2(). Refer to the documentation
- */
-angular.module('ui.directives').directive('uiSelect2', ['ui.config', '$http', function (uiConfig, $http) {
-  var options = {};
-  if (uiConfig.select2) {
-    angular.extend(options, uiConfig.select2);
-  }
-  return {
-    require: '?ngModel',
-    compile: function (tElm, tAttrs) {
-      var watch,
-        repeatOption,
-		repeatAttr,
-        isSelect = tElm.is('select'),
-        isMultiple = (tAttrs.multiple !== undefined);
-
-      // Enable watching of the options dataset if in use
-      if (tElm.is('select')) {
-        repeatOption = tElm.find('option[ng-repeat], option[data-ng-repeat]');
-
-        if (repeatOption.length) {
-		  repeatAttr = repeatOption.attr('ng-repeat') || repeatOption.attr('data-ng-repeat');
-          watch = jQuery.trim(repeatAttr.split('|')[0]).split(' ').pop();
-        }
-      }
-
-      return function (scope, elm, attrs, controller) {
-        // instance-specific options
-        var opts = angular.extend({}, options, scope.$eval(attrs.uiSelect2));
-
-        if (isSelect) {
-          // Use <select multiple> instead
-          delete opts.multiple;
-          delete opts.initSelection;
-        } else if (isMultiple) {
-          opts.multiple = true;
-        }
-
-        if (controller) {
-          // Watch the model for programmatic changes
-          controller.$render = function () {
-            if (isSelect) {
-              elm.select2('val', controller.$modelValue);
-            } else {
-              if (isMultiple && !controller.$modelValue) {
-                elm.select2('data', []);
-              } else {
-                elm.select2('data', controller.$modelValue);
-              }
-            }
-          };
-
-
-          // Watch the options dataset for changes
-          if (watch) {
-            scope.$watch(watch, function (newVal, oldVal, scope) {
-              if (!newVal) return;
-              // Delayed so that the options have time to be rendered
-              setTimeout(function () {
-                elm.select2('val', controller.$viewValue);
-                // Refresh angular to remove the superfluous option
-                elm.trigger('change');
-              });
-            });
-          }
-
-          if (!isSelect) {
-            // Set the view and model value and update the angular template manually for the ajax/multiple select2.
-            elm.bind("change", function () {
-              scope.$apply(function () {
-                controller.$setViewValue(elm.select2('data'));
-              });
-            });
-
-            if (opts.initSelection) {
-              var initSelection = opts.initSelection;
-              opts.initSelection = function (element, callback) {
-                initSelection(element, function (value) {
-                  controller.$setViewValue(value);
-                  callback(value);
-                });
-              };
-            }
-          }
-        }
-
-        attrs.$observe('disabled', function (value) {
-          elm.select2(value && 'disable' || 'enable');
-        });
-
-        scope.$watch(attrs.ngMultiple, function(newVal) {
-          elm.select2(opts);
         });
-
-        // Set initial value since Angular doesn't
-        elm.val(scope.$eval(attrs.ngModel));
-
-        // Initialize the plugin late so that the injected DOM does not disrupt the template compiler
-        setTimeout(function () {
-          elm.select2(opts);
-        });
-      };
-    }
-  };
-}]);
-
-/*global angular, CodeMirror, Error*/
-/**
- * Binds a CodeMirror widget to a <textarea> element.
- */
-angular.module('ui.directives').directive('uiCodemirror', ['ui.config', '$parse', function (uiConfig, $parse) {
-  'use strict';
-
-  uiConfig.codemirror = uiConfig.codemirror || {};
-  return {
-    require: 'ngModel',
-    link: function (scope, elm, attrs, ngModel) {
-      // Only works on textareas
-      if (!elm.is('textarea')) {
-        throw new Error('ui-codemirror can only be applied to a textarea element');
       }
+    };
+  }
+]);
 
-      var codemirror;
-      // This is the method that we use to get the value of the ui-codemirror attribute expression.
-      var uiCodemirrorGet = $parse(attrs.uiCodemirror);
-      // This method will be called whenever the code mirror widget content changes
-      var onChangeHandler = function (ed) {
-        // We only update the model if the value has changed - this helps get around a little problem where $render triggers a change despite already being inside a $apply loop.
-        var newValue = ed.getValue();
-        if (newValue !== ngModel.$viewValue) {
-          ngModel.$setViewValue(newValue);
-          scope.$apply();
-        }
-      };
-      // Create and wire up a new code mirror widget (unwiring a previous one if necessary)
-      var updateCodeMirror = function (options) {
-        // Merge together the options from the uiConfig and the attribute itself with the onChange event above.
-        options = angular.extend({}, options, uiConfig.codemirror);
-
-        // We actually want to run both handlers if the user has provided their own onChange handler.
-        var userOnChange = options.onChange;
-        if (userOnChange) {
-          options.onChange = function (ed) {
-            onChangeHandler(ed);
-            userOnChange(ed);
-          };
-        } else {
-          options.onChange = onChangeHandler;
-        }
-
-        // If there is a codemirror widget for this element already then we need to unwire if first
-        if (codemirror) {
-          codemirror.toTextArea();
-        }
-        // Create the new codemirror widget
-        codemirror = CodeMirror.fromTextArea(elm[0], options);
-      };
-
-      // Initialize the code mirror widget
-      updateCodeMirror(uiCodemirrorGet());
-
-      // Now watch to see if the codemirror attribute gets updated
-      scope.$watch(uiCodemirrorGet, updateCodeMirror, true);
-
-      // CodeMirror expects a string, so make sure it gets one.
-      // This does not change the model.
-      ngModel.$formatters.push(function (value) {
-        if (angular.isUndefined(value) || value === null) {
-          return '';
-        }
-        else if (angular.isObject(value) || angular.isArray(value)) {
-          throw new Error('ui-codemirror cannot use an object or an array as a model');
-        }
-        return value;
-      });
-
-      // Override the ngModelController $render method, which is what gets called when the model is updated.
-      // This takes care of the synchronizing the codeMirror element with the underlying model, in the case that it is changed by something else.
-      ngModel.$render = function () {
-        codemirror.setValue(ngModel.$viewValue);
-      };
-    }
-  };
-}]);
 /**
- * Binds a TinyMCE widget to <textarea> elements.
+ * Add a clear button to form inputs to reset their value
  */
-angular.module('ui.directives').directive('uiTinymce', ['ui.config', function (uiConfig) {
-  uiConfig.tinymce = uiConfig.tinymce || {};
+angular.module('ui.directives').directive('uiReset', ['ui.config', function (uiConfig) {
+  var resetValue = null;
+  if (uiConfig.reset !== undefined)
+      resetValue = uiConfig.reset;
   return {
     require: 'ngModel',
-    link: function (scope, elm, attrs, ngModel) {
-      var expression,
-        options = {
-          // Update model on button click
-          onchange_callback: function (inst) {
-            if (inst.isDirty()) {
-              inst.save();
-              ngModel.$setViewValue(elm.val());
-              if (!scope.$$phase)
-                scope.$apply();
-            }
-          },
-          // Update model on keypress
-          handle_event_callback: function (e) {
-            if (this.isDirty()) {
-              this.save();
-              ngModel.$setViewValue(elm.val());
-              if (!scope.$$phase)
-                scope.$apply();
-            }
-            return true; // Continue handling
-          },
-          // Update model when calling setContent (such as from the source editor popup)
-          setup: function (ed) {
-            ed.onSetContent.add(function (ed, o) {
-              if (ed.isDirty()) {
-                ed.save();
-                ngModel.$setViewValue(elm.val());
-                if (!scope.$$phase)
-                  scope.$apply();
-              }
-            });
-          }
-        };
-      if (attrs.uiTinymce) {
-        expression = scope.$eval(attrs.uiTinymce);
-      } else {
-        expression = {};
-      }
-      angular.extend(options, uiConfig.tinymce, expression);
-      setTimeout(function () {
-        elm.tinymce(options);
+    link: function (scope, elm, attrs, ctrl) {
+      var aElement;
+      aElement = angular.element('<a class="ui-reset" />');
+      elm.wrap('<span class="ui-resetwrap" />').after(aElement);
+      aElement.bind('click', function (e) {
+        e.preventDefault();
+        scope.$apply(function () {
+          if (attrs.uiReset)
+            ctrl.$setViewValue(scope.$eval(attrs.uiReset));
+          else
+            ctrl.$setViewValue(resetValue);
+          ctrl.$render();
+        });
       });
     }
-  };
-}]);
-
-/*
- * Defines the ui-if tag. This removes/adds an element from the dom depending on a condition
- * Originally created by @tigbro, for the @jquery-mobile-angular-adapter
- * https://github.com/tigbro/jquery-mobile-angular-adapter
+  };
+}]);
+
+/**
+ * Set a $uiRoute boolean to see if the current route matches
  */
-angular.module('ui.directives').directive('uiIf', [function () {
+angular.module('ui.directives').directive('uiRoute', ['$location', '$parse', function ($location, $parse) {
   return {
-    transclude: 'element',
-    priority: 1000,
-    terminal: true,
-    restrict: 'A',
-    compile: function (element, attr, linker) {
-      return function (scope, iterStartElement, attr) {
-        iterStartElement[0].doNotMove = true;
-        var expression = attr.uiIf;
-        var lastElement;
-        var lastScope;
-        scope.$watch(expression, function (newValue) {
-          if (lastElement) {
-            lastElement.remove();
-            lastElement = null;
-          }
-          if (lastScope) {
-            lastScope.$destroy();
-            lastScope = null;
-          }
-          if (newValue) {
-            lastScope = scope.$new();
-            linker(lastScope, function (clone) {
-              lastElement = clone;
-              iterStartElement.after(clone);
-            });
-          }
-          // Note: need to be parent() as jquery cannot trigger events on comments
-          // (angular creates a comment node when using transclusion, as ng-repeat does).
-          iterStartElement.parent().trigger("$childrenChanged");
+    restrict: 'AC',
+    compile: function(tElement, tAttrs) {
+      var useProperty;
+      if (tAttrs.uiRoute) {
+        useProperty = 'uiRoute';
+      } else if (tAttrs.ngHref) {
+        useProperty = 'ngHref';
+      } else if (tAttrs.href) {
+        useProperty = 'href';
+      } else {
+        throw new Error('uiRoute missing a route or href property on ' + tElement[0]);
+      }
+      return function ($scope, elm, attrs) {
+        var modelSetter = $parse(attrs.ngModel || attrs.routeModel || '$uiRoute').assign;
+        var watcher = angular.noop;
+
+        // Used by href and ngHref
+        function staticWatcher(newVal) {
+          if ((hash = newVal.indexOf('#')) > -1)
+            newVal = newVal.substr(hash + 1);
+          watcher = function watchHref() {
+            modelSetter($scope, ($location.path().indexOf(newVal) > -1));
+          };
+          watcher();
+        }
+        // Used by uiRoute
+        function regexWatcher(newVal) {
+          if ((hash = newVal.indexOf('#')) > -1)
+            newVal = newVal.substr(hash + 1);
+          watcher = function watchRegex() {
+            var regexp = new RegExp('^' + newVal + '$', ['i']);
+            modelSetter($scope, regexp.test($location.path()));
+          };
+          watcher();
+        }
+
+        switch (useProperty) {
+          case 'uiRoute':
+            // if uiRoute={{}} this will be undefined, otherwise it will have a value and $observe() never gets triggered
+            if (attrs.uiRoute)
+              regexWatcher(attrs.uiRoute);
+            else
+              attrs.$observe('uiRoute', regexWatcher);
+            break;
+          case 'ngHref':
+            // Setup watcher() every time ngHref changes
+            if (attrs.ngHref)
+              staticWatcher(attrs.ngHref);
+            else
+              attrs.$observe('ngHref', staticWatcher);
+            break;
+          case 'href':
+            // Setup watcher()
+            staticWatcher(attrs.href);
+        }
+
+        $scope.$on('$routeChangeSuccess', function(){
+          watcher();
         });
-      };
+      }
     }
   };
 }]);
+
 /*global angular, $, document*/
 /**
  * Adds a 'ui-scrollfix' class to the element when the page scrolls past it's position.
@@ -879,69 +892,131 @@ angular.module('ui.directives').directive('uiScrollfix', ['$window', function ($
   };
 }]);
 
-/*
-*  AngularJs Fullcalendar Wrapper for the JQuery FullCalendar
-*  inspired by http://arshaw.com/fullcalendar/ 
-*  
-*  Basic Angular Calendar Directive that takes in live events as the ng-model and watches that event array for changes, to update the view accordingly. 
-*  Can also take in an event url as a source object(s) and feed the events per view. 
-*
-*/
+/**
+ * Enhanced Select2 Dropmenus
+ *
+ * @AJAX Mode - When in this mode, your value will be an object (or array of objects) of the data used by Select2
+ *     This change is so that you do not have to do an additional query yourself on top of Select2's own query
+ * @params [options] {object} The configuration options passed to $.fn.select2(). Refer to the documentation
+ */
+angular.module('ui.directives').directive('uiSelect2', ['ui.config', '$timeout', function (uiConfig, $timeout) {
+  var options = {};
+  if (uiConfig.select2) {
+    angular.extend(options, uiConfig.select2);
+  }
+  return {
+    require: '?ngModel',
+    compile: function (tElm, tAttrs) {
+      var watch,
+        repeatOption,
+        repeatAttr,
+        isSelect = tElm.is('select'),
+        isMultiple = (tAttrs.multiple !== undefined);
 
-angular.module('ui.directives').directive('uiCalendar',['ui.config', '$parse', function (uiConfig,$parse) {
-    uiConfig.uiCalendar = uiConfig.uiCalendar || {};       
-    //returns the fullcalendar     
-    return {
-        require: 'ngModel',
-        restrict: 'A',
-        scope: {
-          events: "=ngModel"
-        },
-        link: function(scope, elm, $attrs) {
-            var ngModel = $parse($attrs.ngModel);
-            //update method that is called on load and whenever the events array is changed. 
-            function update() {
-              //Default View Options
-              var expression,
-                options = {
-                  header: {
-                  left: 'prev,next today',
-                  center: 'title',
-                  right: 'month,agendaWeek,agendaDay'
-                },
-              // add event name to title attribute on mouseover. 
-              eventMouseover: function(event, jsEvent, view) {
-              if (view.name !== 'agendaDay') {
-                $(jsEvent.target).attr('title', event.title);
-               }
-              },
-          
-              // Calling the events from the scope through the ng-model binding attribute. 
-              events: scope.events
-              };          
-              //if attrs have been entered to the directive, then create a relative expression. 
-              if ($attrs.uiCalendar){
-                 expression = scope.$eval($attrs.uiCalendar);
+      // Enable watching of the options dataset if in use
+      if (tElm.is('select')) {
+        repeatOption = tElm.find('option[ng-repeat], option[data-ng-repeat]');
+
+        if (repeatOption.length) {
+          repeatAttr = repeatOption.attr('ng-repeat') || repeatOption.attr('data-ng-repeat');
+          watch = jQuery.trim(repeatAttr.split('|')[0]).split(' ').pop();
+        }
+      }
+
+      return function (scope, elm, attrs, controller) {
+        // instance-specific options
+        var opts = angular.extend({}, options, scope.$eval(attrs.uiSelect2));
+
+        if (isSelect) {
+          // Use <select multiple> instead
+          delete opts.multiple;
+          delete opts.initSelection;
+        } else if (isMultiple) {
+          opts.multiple = true;
+        }
+
+        if (controller) {
+          // Watch the model for programmatic changes
+          controller.$render = function () {
+            if (isSelect) {
+              elm.select2('val', controller.$modelValue);
+            } else {
+              if (isMultiple) {
+                if (!controller.$modelValue) {
+                  elm.select2('data', []);
+                } else if (angular.isArray(controller.$modelValue)) {
+                  elm.select2('data', controller.$modelValue);
+                } else {
+                  elm.select2('val', controller.$modelValue);
+                }
+              } else {
+                if (angular.isObject(controller.$modelValue)) {
+                  elm.select2('data', controller.$modelValue);
+                } else {
+                  elm.select2('val', controller.$modelValue);
+                }
               }
-              else{
-                expression = {};
-              } 
-              //extend the options to suite the custom directive.
-              angular.extend(options, uiConfig.uiCalendar, expression);
-              //call fullCalendar from an empty html tag, to keep angular happy.
-              elm.html('').fullCalendar(options);
             }
-            //on load update call.
-            update();
-            //watching the length of the array to create a more efficient update process. 
-            scope.$watch( 'events.length', function( newVal, oldVal )
-            {
-              //update the calendar on every change to events.length
-              update();
-            }, true );
+          };
+
+          // Watch the options dataset for changes
+          if (watch) {
+            scope.$watch(watch, function (newVal, oldVal, scope) {
+              if (!newVal) return;
+              // Delayed so that the options have time to be rendered
+              $timeout(function () {
+                elm.select2('val', controller.$viewValue);
+                // Refresh angular to remove the superfluous option
+                elm.trigger('change');
+              });
+            });
+          }
+
+          if (!isSelect) {
+            // Set the view and model value and update the angular template manually for the ajax/multiple select2.
+            elm.bind("change", function () {
+              scope.$apply(function () {
+                controller.$setViewValue(elm.select2('data'));
+              });
+            });
+
+            if (opts.initSelection) {
+              var initSelection = opts.initSelection;
+              opts.initSelection = function (element, callback) {
+                initSelection(element, function (value) {
+                  controller.$setViewValue(value);
+                  callback(value);
+                });
+              };
+            }
+          }
         }
-    };
+
+        attrs.$observe('disabled', function (value) {
+          elm.select2(value && 'disable' || 'enable');
+        });
+
+        if (attrs.ngMultiple) {
+          scope.$watch(attrs.ngMultiple, function(newVal) {
+            elm.select2(opts);
+          });
+        }
+
+        // Set initial value since Angular doesn't
+        elm.val(scope.$eval(attrs.ngModel));
+
+        // Initialize the plugin late so that the injected DOM does not disrupt the template compiler
+        $timeout(function () {
+          elm.select2(opts);
+          // Not sure if I should just check for !isSelect OR if I should check for 'tags' key
+          if (!opts.initSelection && !isSelect)
+            controller.$setViewValue(elm.select2('data'));
+        });
+      };
+    }
+  };
 }]);
+
 /**
  * uiShow Directive
  *
@@ -1004,189 +1079,237 @@ angular.module('ui.directives').directive('uiShow', [function () {
 }]);
 
 /*
- Gives the ability to style currency based on its sign.
- */
-angular.module('ui.directives').directive('uiCurrency', ['ui.config', 'currencyFilter' , function (uiConfig, currencyFilter) {
-  var options = {
-    pos: 'ui-currency-pos',
-    neg: 'ui-currency-neg',
-    zero: 'ui-currency-zero'
-  };
-  if (uiConfig.currency) {
-    angular.extend(options, uiConfig.currency);
-  }
-  return {
-    restrict: 'EAC',
-    require: 'ngModel',
-    link: function (scope, element, attrs, controller) {
-      var opts, // instance-specific options
-        renderview,
-        value;
+ jQuery UI Sortable plugin wrapper
 
-      opts = angular.extend({}, options, scope.$eval(attrs.uiCurrency));
+ @param [ui-sortable] {object} Options to pass to $.fn.sortable() merged onto ui.config
+*/
+angular.module('ui.directives').directive('uiSortable', [
+  'ui.config', function(uiConfig) {
+    return {
+      require: '?ngModel',
+      link: function(scope, element, attrs, ngModel) {
+        var onReceive, onRemove, onStart, onUpdate, opts, _receive, _remove, _start, _update;
 
-      renderview = function (viewvalue) {
-        var num;
-        num = viewvalue * 1;
-        if (num > 0) {
-          element.addClass(opts.pos);
-        } else {
-          element.removeClass(opts.pos);
-        }
-        if (num < 0) {
-          element.addClass(opts.neg);
-        } else {
-          element.removeClass(opts.neg);
-        }
-        if (num === 0) {
-          element.addClass(opts.zero);
-        } else {
-          element.removeClass(opts.zero);
-        }
-        if (viewvalue === '') {
-          element.text('');
-        } else {
-          element.text(currencyFilter(num, opts.symbol));
-        }
-        return true;
-      };
+        opts = angular.extend({}, uiConfig.sortable, scope.$eval(attrs.uiSortable));
 
-      controller.$render = function () {
-        value = controller.$viewValue;
-        element.val(value);
-        renderview(value);
-      };
+        if (ngModel) {
 
-    }
-  };
-}]);
+          ngModel.$render = function() {
+            element.sortable( "refresh" );
+          };
 
-/*global angular */
-/*
- jQuery UI Datepicker plugin wrapper
+          onStart = function(e, ui) {
+            // Save position of dragged item
+            ui.item.sortable = { index: ui.item.index() };
+          };
 
- @param [ui-date] {object} Options to pass to $.fn.datepicker() merged onto ui.config
- */
+          onUpdate = function(e, ui) {
+            // For some reason the reference to ngModel in stop() is wrong
+            ui.item.sortable.resort = ngModel;
+          };
 
-angular.module('ui.directives')
+          onReceive = function(e, ui) {
+            ui.item.sortable.relocate = true;
+            // added item to array into correct position and set up flag
+            ngModel.$modelValue.splice(ui.item.index(), 0, ui.item.sortable.moved);
+          };
 
-.directive('uiDate', ['ui.config', function (uiConfig) {
-  'use strict';
-  var options;
-  options = {};
-  if (angular.isObject(uiConfig.date)) {
-    angular.extend(options, uiConfig.date);
-  }
-  return {
-    require:'?ngModel',
-    link:function (scope, element, attrs, controller) {
-      var getOptions = function () {
-        return angular.extend({}, uiConfig.date, scope.$eval(attrs.uiDate));
-      };
-      var initDateWidget = function () {
-        var opts = getOptions();
+          onRemove = function(e, ui) {
+            // copy data into item
+            if (ngModel.$modelValue.length === 1) {
+              ui.item.sortable.moved = ngModel.$modelValue.splice(0, 1)[0];
+            } else {
+              ui.item.sortable.moved =  ngModel.$modelValue.splice(ui.item.sortable.index, 1)[0];
+            }
+          };
 
-        // If we have a controller (i.e. ngModelController) then wire it up
-        if (controller) {
-          var updateModel = function () {
-            scope.$apply(function () {
-              var date = element.datepicker("getDate");
-              element.datepicker("setDate", element.val());
-              controller.$setViewValue(date);
-            });
+          onStop = function(e, ui) {
+            // digest all prepared changes
+            if (ui.item.sortable.resort && !ui.item.sortable.relocate) {
+
+              // Fetch saved and current position of dropped element
+              var end, start;
+              start = ui.item.sortable.index;
+              end = ui.item.index();
+              if (start < end)
+                end--;
+
+              // Reorder array and apply change to scope
+              ui.item.sortable.resort.$modelValue.splice(end, 0, ui.item.sortable.resort.$modelValue.splice(start, 1)[0]);
+
+            }
+            if (ui.item.sortable.resort || ui.item.sortable.relocate) {
+              scope.$apply();
+            }
+          };
+
+          // If user provided 'start' callback compose it with onStart function
+          _start = opts.start;
+          opts.start = function(e, ui) {
+            onStart(e, ui);
+            if (typeof _start === "function")
+              _start(e, ui);
+          };
+
+          // If user provided 'start' callback compose it with onStart function
+          _stop = opts.stop;
+          opts.stop = function(e, ui) {
+            onStop(e, ui);
+            if (typeof _stop === "function")
+              _stop(e, ui);
+          };
+
+          // If user provided 'update' callback compose it with onUpdate function
+          _update = opts.update;
+          opts.update = function(e, ui) {
+            onUpdate(e, ui);
+            if (typeof _update === "function")
+              _update(e, ui);
           };
-          if (opts.onSelect) {
-            // Caller has specified onSelect, so call this as well as updating the model
-            var userHandler = opts.onSelect;
-            opts.onSelect = function (value, picker) {
-              updateModel();
-              return userHandler(value, picker);
-            };
-          } else {
-            // No onSelect already specified so just update the model
-            opts.onSelect = updateModel;
-          }
-          // In case the user changes the text directly in the input box
-          element.bind('change', updateModel);
 
-          // Update the date picker when the model changes
-          controller.$render = function () {
-            var date = controller.$viewValue;
-            if ( angular.isDefined(date) && date !== null && !angular.isDate(date) ) {
-              throw new Error('ng-Model value must be a Date object - currently it is a ' + typeof date + ' - use ui-date-format to convert it from a string');
-            }
-            element.datepicker("setDate", date);
+          // If user provided 'receive' callback compose it with onReceive function
+          _receive = opts.receive;
+          opts.receive = function(e, ui) {
+            onReceive(e, ui);
+            if (typeof _receive === "function")
+              _receive(e, ui);
+          };
+
+          // If user provided 'remove' callback compose it with onRemove function
+          _remove = opts.remove;
+          opts.remove = function(e, ui) {
+            onRemove(e, ui);
+            if (typeof _remove === "function")
+              _remove(e, ui);
           };
         }
-        // If we don't destroy the old one it doesn't update properly when the config changes
-        element.datepicker('destroy');
-        // Create the new datepicker widget
-        element.datepicker(opts);
-        // Force a render to override whatever is in the input text box
-        controller.$render();
-      };
-      // Watch for changes to the directives options
-      scope.$watch(getOptions, initDateWidget, true);
-    }
-  };
-}
-])
 
-.directive('uiDateFormat', [function() {
-  var directive = {
-    require:'ngModel',
-    link: function(scope, element, attrs, modelCtrl) {
-      if ( attrs.uiDateFormat === '' ) {
-        // Default to ISO formatting
-        modelCtrl.$formatters.push(function(value) {
-          if (angular.isString(value) ) {
-            return new Date(value);
-          }
-        });
-        modelCtrl.$parsers.push(function(value){
-          if (value) {
-            return value.toISOString();
-          }
-        });
-      } else {
-        var format = attrs.uiDateFormat;
-        // Use the datepicker with the attribute value as the format string to convert to and from a string
-        modelCtrl.$formatters.push(function(value) {
-          if (angular.isString(value) ) {
-            return $.datepicker.parseDate(format, value);
-          }
-        });
-        modelCtrl.$parsers.push(function(value){
-          if (value) {
-            return $.datepicker.formatDate(format, value);
-          }
-        });
+        // Create sortable
+        element.sortable(opts);
       }
-    }
-  };
-  return directive;
-}]);
+    };
+  }
+]);
 
 /**
- * Wraps the
- * @param text {string} haystack to search through
- * @param search {string} needle to search for
- * @param [caseSensitive] {boolean} optional boolean to use case-sensitive searching
+ * Binds a TinyMCE widget to <textarea> elements.
  */
-angular.module('ui.filters').filter('highlight', function () {
-  return function (text, search, caseSensitive) {
-    if (search || angular.isNumber(search)) {
-      text = text.toString();
-      search = search.toString();
-      if (caseSensitive) {
-        return text.split(search).join('<span class="ui-match">' + search + '</span>');
+angular.module('ui.directives').directive('uiTinymce', ['ui.config', function (uiConfig) {
+  uiConfig.tinymce = uiConfig.tinymce || {};
+  return {
+    require: 'ngModel',
+    link: function (scope, elm, attrs, ngModel) {
+      var expression,
+        options = {
+          // Update model on button click
+          onchange_callback: function (inst) {
+            if (inst.isDirty()) {
+              inst.save();
+              ngModel.$setViewValue(elm.val());
+              if (!scope.$$phase)
+                scope.$apply();
+            }
+          },
+          // Update model on keypress
+          handle_event_callback: function (e) {
+            if (this.isDirty()) {
+              this.save();
+              ngModel.$setViewValue(elm.val());
+              if (!scope.$$phase)
+                scope.$apply();
+            }
+            return true; // Continue handling
+          },
+          // Update model when calling setContent (such as from the source editor popup)
+          setup: function (ed) {
+            ed.onSetContent.add(function (ed, o) {
+              if (ed.isDirty()) {
+                ed.save();
+                ngModel.$setViewValue(elm.val());
+                if (!scope.$$phase)
+                  scope.$apply();
+              }
+            });
+          }
+        };
+      if (attrs.uiTinymce) {
+        expression = scope.$eval(attrs.uiTinymce);
       } else {
-        return text.replace(new RegExp(search, 'gi'), '<span class="ui-match">$&</span>');
+        expression = {};
       }
-    } else {
-      return text;
+      angular.extend(options, uiConfig.tinymce, expression);
+      setTimeout(function () {
+        elm.tinymce(options);
+      });
     }
   };
+}]);
+
+/**
+ * General-purpose validator for ngModel.
+ * angular.js comes with several built-in validation mechanism for input fields (ngRequired, ngPattern etc.) but using
+ * an arbitrary validation function requires creation of a custom formatters and / or parsers.
+ * The ui-validate directive makes it easy to use any function(s) defined in scope as a validator function(s).
+ * A validator function will trigger validation on both model and input changes.
+ *
+ * @example <input ui-validate=" 'myValidatorFunction($value)' ">
+ * @example <input ui-validate="{ foo : '$value > anotherModel', bar : 'validateFoo($value)' }">
+ * @example <input ui-validate="{ foo : '$value > anotherModel' }" ui-validate-watch=" 'anotherModel' ">
+ * @example <input ui-validate="{ foo : '$value > anotherModel', bar : 'validateFoo($value)' }" ui-validate-watch=" { foo : 'anotherModel' } ">
+ *
+ * @param ui-validate {string|object literal} If strings is passed it should be a scope's function to be used as a validator.
+ * If an object literal is passed a key denotes a validation error key while a value should be a validator function.
+ * In both cases validator function should take a value to validate as its argument and should return true/false indicating a validation result.
+ */
+angular.module('ui.directives').directive('uiValidate', function () {
+
+  return {
+    restrict: 'A',
+    require: 'ngModel',
+    link: function (scope, elm, attrs, ctrl) {
+      var validateFn, watch, validators = {},
+        validateExpr = scope.$eval(attrs.uiValidate);
+
+      if (!validateExpr) return;
+
+      if (angular.isString(validateExpr)) {
+        validateExpr = { validator: validateExpr };
+      }
+
+      angular.forEach(validateExpr, function (expression, key) {
+        validateFn = function (valueToValidate) {
+          if (scope.$eval(expression, { '$value' : valueToValidate })) {
+            ctrl.$setValidity(key, true);
+            return valueToValidate;
+          } else {
+            ctrl.$setValidity(key, false);
+            return undefined;
+          }
+        };
+        validators[key] = validateFn;
+        ctrl.$formatters.push(validateFn);
+        ctrl.$parsers.push(validateFn);
+      });
+
+      // Support for ui-validate-watch
+      if (attrs.uiValidateWatch) {
+        watch = scope.$eval(attrs.uiValidateWatch);
+        if (angular.isString(watch)) {
+          scope.$watch(watch, function(){
+            angular.forEach(validators, function(validatorFn, key){
+              validatorFn(ctrl.$modelValue);
+            });
+          });
+        } else {
+          angular.forEach(watch, function(expression, key){
+            scope.$watch(expression, function(){
+              validators[key](ctrl.$modelValue);
+            });
+          });
+        }
+      }
+    }
+  };
 });
 
 
@@ -1225,48 +1348,24 @@ angular.module('ui.filters').filter('format', function(){
 });
 
 /**
- * Filters out all duplicate items from an array by checking the specified key
- * @param [key] {string} the name of the attribute of each object to compare for uniqueness
- if the key is empty, the entire object will be compared
- if the key === false then no filtering will be performed
- * @return {array}
+ * Wraps the
+ * @param text {string} haystack to search through
+ * @param search {string} needle to search for
+ * @param [caseSensitive] {boolean} optional boolean to use case-sensitive searching
  */
-angular.module('ui.filters').filter('unique', function () {
-
-  return function (items, filterOn) {
-
-    if (filterOn === false) {
-      return items;
-    }
-
-    if ((filterOn || angular.isUndefined(filterOn)) && angular.isArray(items)) {
-      var hashCheck = {}, newItems = [];
-
-      var extractValueToCompare = function (item) {
-        if (angular.isObject(item) && angular.isString(filterOn)) {
-          return item[filterOn];
-        } else {
-          return item;
-        }
-      };
-
-      angular.forEach(items, function (item) {
-        var valueToCheck, isDuplicate = false;
-
-        for (var i = 0; i < newItems.length; i++) {
-          if (angular.equals(extractValueToCompare(newItems[i]), extractValueToCompare(item))) {
-            isDuplicate = true;
-            break;
-          }
-        }
-        if (!isDuplicate) {
-          newItems.push(item);
-        }
-
-      });
-      items = newItems;
+angular.module('ui.filters').filter('highlight', function () {
+  return function (text, search, caseSensitive) {
+    if (search || angular.isNumber(search)) {
+      text = text.toString();
+      search = search.toString();
+      if (caseSensitive) {
+        return text.split(search).join('<span class="ui-match">' + search + '</span>');
+      } else {
+        return text.replace(new RegExp(search, 'gi'), '<span class="ui-match">$&</span>');
+      }
+    } else {
+      return text;
     }
-    return items;
   };
 });
 
@@ -1314,3 +1413,49 @@ angular.module('ui.filters').filter('inflector', function () {
     }
   };
 });
+
+/**
+ * Filters out all duplicate items from an array by checking the specified key
+ * @param [key] {string} the name of the attribute of each object to compare for uniqueness
+ if the key is empty, the entire object will be compared
+ if the key === false then no filtering will be performed
+ * @return {array}
+ */
+angular.module('ui.filters').filter('unique', function () {
+
+  return function (items, filterOn) {
+
+    if (filterOn === false) {
+      return items;
+    }
+
+    if ((filterOn || angular.isUndefined(filterOn)) && angular.isArray(items)) {
+      var hashCheck = {}, newItems = [];
+
+      var extractValueToCompare = function (item) {
+        if (angular.isObject(item) && angular.isString(filterOn)) {
+          return item[filterOn];
+        } else {
+          return item;
+        }
+      };
+
+      angular.forEach(items, function (item) {
+        var valueToCheck, isDuplicate = false;
+
+        for (var i = 0; i < newItems.length; i++) {
+          if (angular.equals(extractValueToCompare(newItems[i]), extractValueToCompare(item))) {
+            isDuplicate = true;
+            break;
+          }
+        }
+        if (!isDuplicate) {
+          newItems.push(item);
+        }
+
+      });
+      items = newItems;
+    }
+    return items;
+  };
+});