brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [3/8] incubator-brooklyn git commit: restructure JS code replacing minimised and anonymous code with our own code
Date Thu, 01 Oct 2015 21:40:16 GMT
restructure JS code replacing minimised and anonymous code with our own code


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a4a14f95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a4a14f95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a4a14f95

Branch: refs/heads/master
Commit: a4a14f95ddeb65e1508d96ef11abebf071cf1d9f
Parents: 2995471
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Sun Sep 27 03:04:36 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Sun Sep 27 03:35:17 2015 +0100

----------------------------------------------------------------------
 usage/jsgui/src/main/webapp/assets/js/config.js |     4 +-
 .../assets/js/libs/dataTables.extensions.js     |    34 -
 .../webapp/assets/js/libs/jquery.dataTables.js  | 12233 ++++++++++++++++-
 .../webapp/assets/js/libs/jquery.slideto.min.js |     7 -
 .../assets/js/util/dataTables.extensions.js     |    50 +
 .../webapp/assets/js/util/jquery.slideto.js     |    55 +
 usage/jsgui/src/test/javascript/config.txt      |     4 +-
 7 files changed, 12197 insertions(+), 190 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4a14f95/usage/jsgui/src/main/webapp/assets/js/config.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/config.js b/usage/jsgui/src/main/webapp/assets/js/config.js
index 4fa477d..6710ff1 100644
--- a/usage/jsgui/src/main/webapp/assets/js/config.js
+++ b/usage/jsgui/src/main/webapp/assets/js/config.js
@@ -32,7 +32,7 @@ require.config({
         "bootstrap":"libs/bootstrap",
         "jquery-form":"libs/jquery.form",
         "jquery-datatables":"libs/jquery.dataTables",
-        "jquery-slideto":"libs/jquery.slideto.min",
+        "jquery-slideto":"util/jquery.slideto",
         "jquery-wiggle":"libs/jquery.wiggle.min",
         "jquery-ba-bbq":"libs/jquery.ba-bbq.min",
         "moment":"libs/moment",
@@ -40,7 +40,7 @@ require.config({
         "brooklyn":"util/brooklyn",
         "brooklyn-view":"util/brooklyn-view",
         "brooklyn-utils":"util/brooklyn-utils",
-        "datatables-extensions":"libs/dataTables.extensions",
+        "datatables-extensions":"util/dataTables.extensions",
         "googlemaps":"view/googlemaps",
         "async":"libs/async",  //not explicitly referenced, but needed for google
         "text":"libs/text",

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4a14f95/usage/jsgui/src/main/webapp/assets/js/libs/dataTables.extensions.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/libs/dataTables.extensions.js b/usage/jsgui/src/main/webapp/assets/js/libs/dataTables.extensions.js
deleted file mode 100644
index 18ed971..0000000
--- a/usage/jsgui/src/main/webapp/assets/js/libs/dataTables.extensions.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// brooklyn note: same license as jquery.datatables, viz MIT license
-
-/*
- * jQuery DataTables fnStandingRedraw plug-in.
- *
- * http://www.datatables.net/plug-ins/api#fnStandingRedraw
- */
-define([
-    "jquery", "jquery-datatables"
-], function($, dataTables) {
-
-$.fn.dataTableExt.oApi.fnStandingRedraw = function(oSettings) {
-    if (oSettings.oFeatures.bServerSide === false) {
-        var before = oSettings._iDisplayStart;
-        oSettings.oApi._fnReDraw(oSettings);
-        // iDisplayStart has been reset to zero - so lets change it back
-        oSettings._iDisplayStart = before;
-        oSettings.oApi._fnCalculateEnd(oSettings);
-    }
-    // draw the 'current' page
-    oSettings.oApi._fnDraw(oSettings);
-};
-
-
-jQuery.fn.dataTableExt.oApi.fnProcessingIndicator = function ( oSettings, onoff )
-{
-    if( typeof(onoff) == 'undefined' )
-    {
-        onoff=true;
-    }
-    this.oApi._fnProcessingDisplay( oSettings, onoff );
-};
-
-});


Mime
View raw message