Skip to content

Commit

Permalink
Merge pull request #1742 from BladeRunnerJS/1702/upgrade-brjs-version
Browse files Browse the repository at this point in the history
1702/upgrade brjs version
  • Loading branch information
thecapdan committed Nov 7, 2016
2 parents faa9f38 + 76ab2bf commit 895b332
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 11 deletions.
Expand Up @@ -60,11 +60,6 @@
this.m_oViewFixture.doThen("view.(div#hidden-div).isVisible", false);
};

IsVisibleTest.prototype.test_divElementWithZeroSizeIsInvisible = function()
{
this.m_oViewFixture.doThen("view.(div#zero-div).isVisible", false);
};

IsVisibleTest.prototype.test_childOfInvisibleElementIsInvisible = function()
{
this.m_oViewFixture.doThen("view.(div#hidden-parent).isVisible", false);
Expand Down
5 changes: 0 additions & 5 deletions brjs-sdk/sdk/libs/javascript/jquery/jquery-1.10.2.min.js

This file was deleted.

10 changes: 10 additions & 0 deletions brjs-sdk/sdk/libs/javascript/jquery/jquery-1.12.4-patch.js
@@ -0,0 +1,10 @@
/*
Fix for https://github.com/jquery/jquery/issues/2432
this fix was originally part of jquery 1.12.4 but it was removed as it contained a backward
breaking change, but this compatibility issue should not impact brjs libraries
*/
jQuery.ajaxPrefilter( function( s ) {
if ( s.crossDomain ) {
s.contents.script = false;
}
} );
5 changes: 5 additions & 0 deletions brjs-sdk/sdk/libs/javascript/jquery/jquery-1.12.4.min.js

Large diffs are not rendered by default.

@@ -1,3 +1,3 @@
js : jquery-1.10.2.min.js, jquery-ui-1.10.3.custom.js
js : jquery-1.12.4.min.js, jquery-1.12.4-patch.js, jquery-ui-1.10.3.custom.js
css: resources/css/jquery-ui-1.8.23.custom.css
exports: jQuery
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions releases/v1.5.4.json
@@ -0,0 +1,5 @@
{
"milestone": "1.5.4",
"name": "BladeRunnerJS 1.5.4",
"prerelease": false
}
5 changes: 5 additions & 0 deletions releases/v1.5.4.md
@@ -0,0 +1,5 @@
## BladeRunnerJS @tagVersion@

BladeRunnerJS @tagVersion@ contains one change.

- The thirdparty library jQuery has been upgraded to version 1.12.4. Please consult the jQuery release notes for further information.

0 comments on commit 895b332

Please sign in to comment.