Skip to content

Commit 24c82c5

Browse files
committed
updated angular and requirejs.
1 parent 6dc364c commit 24c82c5

40 files changed

+5524
-3724
lines changed

src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<SpecificVersion>False</SpecificVersion>
5757
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
5858
</Reference>
59-
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.3\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
59+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
77
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
88
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
9-
<package id="EntityFramework.DynamicFilters" version="1.4.3" targetFramework="net451" />
9+
<package id="EntityFramework.DynamicFilters" version="1.4.4" targetFramework="net451" />
1010
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
1111
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
1212
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
<SpecificVersion>False</SpecificVersion>
9090
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
9191
</Reference>
92-
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
93-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.3\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
92+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
93+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
9494
<Private>True</Private>
9595
</Reference>
9696
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

src/AbpCompanyName.AbpProjectName.WebMpa/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
1616
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net451" />
1717
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
18-
<package id="EntityFramework.DynamicFilters" version="1.4.3" targetFramework="net451" />
18+
<package id="EntityFramework.DynamicFilters" version="1.4.4" targetFramework="net451" />
1919
<package id="FontAwesome" version="4.4.0" targetFramework="net451" />
2020
<package id="jQuery" version="2.1.4" targetFramework="net451" />
2121
<package id="jQuery.BlockUI" version="2.70" targetFramework="net451" />

src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
<SpecificVersion>False</SpecificVersion>
8787
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
8888
</Reference>
89-
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.3.0, Culture=neutral, processorArchitecture=MSIL">
90-
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.3\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
89+
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
90+
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
9191
<Private>True</Private>
9292
</Reference>
9393
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -320,6 +320,9 @@
320320
<Content Include="fonts\fontawesome-webfont.woff" />
321321
<Content Include="fonts\fontawesome-webfont.ttf" />
322322
<Content Include="fonts\fontawesome-webfont.eot" />
323+
<Content Include="Abp\Framework\styles\abp.mixings.less" />
324+
<Content Include="Abp\Framework\styles\abp.less" />
325+
<Content Include="Abp\Framework\styles\abp.css.map" />
323326
<Content Include="Scripts\errors.json" />
324327
<Content Include="Scripts\angular-touch.min.js.map" />
325328
<Content Include="Scripts\angular-sanitize.min.js.map" />
@@ -332,9 +335,6 @@
332335
<Content Include="Scripts\angular-aria.min.js.map" />
333336
<Content Include="Scripts\angular-animate.min.js.map" />
334337
<Content Include="Scripts\angular.min.js.map" />
335-
<Content Include="Abp\Framework\styles\abp.mixings.less" />
336-
<Content Include="Abp\Framework\styles\abp.less" />
337-
<Content Include="Abp\Framework\styles\abp.css.map" />
338338
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
339339
<Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
340340
<Content Include="Scripts\i18n\angular-locale_aa-er.js" />

src/AbpCompanyName.AbpProjectName.WebSpaAngular/Scripts/angular-animate.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.7
2+
* @license AngularJS v1.4.8
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -622,6 +622,8 @@ var ANIMATE_TIMER_KEY = '$$animateCss';
622622
*
623623
* * `event` - The DOM event (e.g. enter, leave, move). When used, a generated CSS class of `ng-EVENT` and `ng-EVENT-active` will be applied
624624
* to the element during the animation. Multiple events can be provided when spaces are used as a separator. (Note that this will not perform any DOM operation.)
625+
* * `structural` - Indicates that the `ng-` prefix will be added to the event class. Setting to `false` or omitting will turn `ng-EVENT` and
626+
* `ng-EVENT-active` in `EVENT` and `EVENT-active`. Unused if `event` is omitted.
625627
* * `easing` - The CSS easing value that will be applied to the transition or keyframe animation (or both).
626628
* * `transitionStyle` - The raw CSS transition style that will be used (e.g. `1s linear all`).
627629
* * `keyframeStyle` - The raw CSS keyframe animation style that will be used (e.g. `1s my_animation linear`).
@@ -2133,15 +2135,18 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
21332135
return mergeAnimationOptions(element, options, {});
21342136
}
21352137

2136-
function findCallbacks(element, event) {
2138+
function findCallbacks(parent, element, event) {
21372139
var targetNode = getDomNode(element);
2140+
var targetParentNode = getDomNode(parent);
21382141

21392142
var matches = [];
21402143
var entries = callbackRegistry[event];
21412144
if (entries) {
21422145
forEach(entries, function(entry) {
21432146
if (entry.node.contains(targetNode)) {
21442147
matches.push(entry.callback);
2148+
} else if (event === 'leave' && entry.node.contains(targetParentNode)) {
2149+
matches.push(entry.callback);
21452150
}
21462151
});
21472152
}
@@ -2467,7 +2472,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
24672472

24682473
function notifyProgress(runner, event, phase, data) {
24692474
runInNextPostDigestOrNow(function() {
2470-
var callbacks = findCallbacks(element, event);
2475+
var callbacks = findCallbacks(parent, element, event);
24712476
if (callbacks.length) {
24722477
// do not optimize this call here to RAF because
24732478
// we don't know how heavy the callback code here will
@@ -3458,7 +3463,7 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
34583463
* jQuery(element).fadeOut(1000, doneFn);
34593464
* }
34603465
* }
3461-
* }]
3466+
* }]);
34623467
* ```
34633468
*
34643469
* The nice thing about JS-based animations is that we can inject other services and make use of advanced animation libraries such as
@@ -3489,7 +3494,7 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
34893494
* // do some cool animation and call the doneFn
34903495
* }
34913496
* }
3492-
* }]
3497+
* }]);
34933498
* ```
34943499
*
34953500
* ## CSS + JS Animations Together
@@ -3511,7 +3516,7 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
35113516
* jQuery(element).slideIn(1000, doneFn);
35123517
* }
35133518
* }
3514-
* }]
3519+
* }]);
35153520
* ```
35163521
*
35173522
* ```css
@@ -3531,16 +3536,15 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
35313536
* ```js
35323537
* myModule.animation('.slide', ['$animateCss', function($animateCss) {
35333538
* return {
3534-
* enter: function(element, doneFn) {
3539+
* enter: function(element) {
35353540
* // this will trigger `.slide.ng-enter` and `.slide.ng-enter-active`.
3536-
* var runner = $animateCss(element, {
3541+
* return $animateCss(element, {
35373542
* event: 'enter',
35383543
* structural: true
3539-
* }).start();
3540-
* runner.done(doneFn);
3544+
* });
35413545
* }
35423546
* }
3543-
* }]
3547+
* }]);
35443548
* ```
35453549
*
35463550
* The nice thing here is that we can save bandwidth by sticking to our CSS-based animation code and we don't need to rely on a 3rd-party animation framework.
@@ -3552,19 +3556,17 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
35523556
* ```js
35533557
* myModule.animation('.slide', ['$animateCss', function($animateCss) {
35543558
* return {
3555-
* enter: function(element, doneFn) {
3556-
* var runner = $animateCss(element, {
3559+
* enter: function(element) {
3560+
* return $animateCss(element, {
35573561
* event: 'enter',
35583562
* structural: true,
35593563
* addClass: 'maroon-setting',
35603564
* from: { height:0 },
35613565
* to: { height: 200 }
3562-
* }).start();
3563-
*
3564-
* runner.done(doneFn);
3566+
* });
35653567
* }
35663568
* }
3567-
* }]
3569+
* }]);
35683570
* ```
35693571
*
35703572
* Now we can fill in the rest via our transition CSS code:

0 commit comments

Comments
 (0)