mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Client build: remove references to ui.js in client and templates; mv scripts/jq-plugins/ui to more generic/catch-all scripts/ui/
This commit is contained in:
Carl Eberhard
@@ -3,7 +3,7 @@ define([
|
||||
"mvc/dataset/dataset-li",
|
||||
"mvc/tags",
|
||||
"mvc/annotations",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization"
|
||||
], function( STATES, DATASET_LI, TAGS, ANNOTATIONS, faIconButton, BASE_MVC, _l ){
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
define([
|
||||
"mvc/list/list-item",
|
||||
"mvc/dataset/states",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization"
|
||||
], function( LIST_ITEM, STATES, faIconButton, BASE_MVC, _l ){
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
define([
|
||||
"mvc/dataset/states",
|
||||
"mvc/history/hdca-li",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"utils/localization"
|
||||
], function( STATES, HDCA_LI, faIconButton, _l ){
|
||||
//==============================================================================
|
||||
|
||||
@@ -7,7 +7,7 @@ define([
|
||||
"mvc/history/hdca-li-edit",
|
||||
"mvc/tags",
|
||||
"mvc/annotations",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/ui/popup-menu",
|
||||
"utils/localization"
|
||||
], function(
|
||||
|
||||
@@ -6,10 +6,10 @@ define([
|
||||
"mvc/history/hdca-li",
|
||||
"mvc/collection/collection-panel",
|
||||
"mvc/user/user-model",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization",
|
||||
"jq-plugins/ui/search-input"
|
||||
"ui/search-input"
|
||||
], function(
|
||||
LIST_PANEL,
|
||||
HISTORY_MODEL,
|
||||
|
||||
@@ -3,8 +3,8 @@ define([
|
||||
"mvc/history/history-panel-edit",
|
||||
"mvc/base-mvc",
|
||||
"utils/ajax-queue",
|
||||
"jq-plugins/ui/mode-button",
|
||||
"jq-plugins/ui/search-input"
|
||||
"ui/mode-button",
|
||||
"ui/search-input"
|
||||
], function( HISTORY_MODEL, HPANEL_EDIT, baseMVC, ajaxQueue ){
|
||||
window.HISTORY_MODEL = HISTORY_MODEL;
|
||||
//==============================================================================
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
define([
|
||||
"mvc/list/list-item",
|
||||
"jq-plugins/ui/loading-indicator",
|
||||
"ui/loading-indicator",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization",
|
||||
"jq-plugins/ui/search-input"
|
||||
"ui/search-input"
|
||||
], function( LIST_ITEM, LoadingIndicator, BASE_MVC, _l ){
|
||||
/* ============================================================================
|
||||
TODO:
|
||||
|
||||
@@ -6,7 +6,6 @@ define(["utils/utils",
|
||||
"mvc/upload/upload-ftp",
|
||||
"mvc/ui/ui-popover",
|
||||
"mvc/ui/ui-modal",
|
||||
"mvc/ui",
|
||||
"utils/uploadbox"],
|
||||
|
||||
function( Utils,
|
||||
|
||||
@@ -20,8 +20,7 @@ require(
|
||||
'libs/jquery/select2',
|
||||
'libs/farbtastic',
|
||||
'libs/jquery/jquery.form',
|
||||
'libs/jquery/jquery.rating',
|
||||
'mvc/ui'
|
||||
'libs/jquery/jquery.rating'
|
||||
], function(mod_utils, mod_icon_btn)
|
||||
{
|
||||
// load css
|
||||
|
||||
@@ -3,7 +3,7 @@ define([
|
||||
"mvc/dataset/dataset-li",
|
||||
"mvc/tags",
|
||||
"mvc/annotations",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization"
|
||||
], function( STATES, DATASET_LI, TAGS, ANNOTATIONS, faIconButton, BASE_MVC, _l ){
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
define([
|
||||
"mvc/list/list-item",
|
||||
"mvc/dataset/states",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization"
|
||||
], function( LIST_ITEM, STATES, faIconButton, BASE_MVC, _l ){
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
define([
|
||||
"mvc/dataset/states",
|
||||
"mvc/history/hdca-li",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"utils/localization"
|
||||
], function( STATES, HDCA_LI, faIconButton, _l ){
|
||||
//==============================================================================
|
||||
|
||||
@@ -7,7 +7,7 @@ define([
|
||||
"mvc/history/hdca-li-edit",
|
||||
"mvc/tags",
|
||||
"mvc/annotations",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/ui/popup-menu",
|
||||
"utils/localization"
|
||||
], function(
|
||||
|
||||
@@ -6,10 +6,10 @@ define([
|
||||
"mvc/history/hdca-li",
|
||||
"mvc/collection/collection-panel",
|
||||
"mvc/user/user-model",
|
||||
"jq-plugins/ui/fa-icon-button",
|
||||
"ui/fa-icon-button",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization",
|
||||
"jq-plugins/ui/search-input"
|
||||
"ui/search-input"
|
||||
], function(
|
||||
LIST_PANEL,
|
||||
HISTORY_MODEL,
|
||||
|
||||
@@ -3,8 +3,8 @@ define([
|
||||
"mvc/history/history-panel-edit",
|
||||
"mvc/base-mvc",
|
||||
"utils/ajax-queue",
|
||||
"jq-plugins/ui/mode-button",
|
||||
"jq-plugins/ui/search-input"
|
||||
"ui/mode-button",
|
||||
"ui/search-input"
|
||||
], function( HISTORY_MODEL, HPANEL_EDIT, baseMVC, ajaxQueue ){
|
||||
window.HISTORY_MODEL = HISTORY_MODEL;
|
||||
//==============================================================================
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
define([
|
||||
"mvc/list/list-item",
|
||||
"jq-plugins/ui/loading-indicator",
|
||||
"ui/loading-indicator",
|
||||
"mvc/base-mvc",
|
||||
"utils/localization",
|
||||
"jq-plugins/ui/search-input"
|
||||
"ui/search-input"
|
||||
], function( LIST_ITEM, LoadingIndicator, BASE_MVC, _l ){
|
||||
/* ============================================================================
|
||||
TODO:
|
||||
|
||||
@@ -6,7 +6,6 @@ define(["utils/utils",
|
||||
"mvc/upload/upload-ftp",
|
||||
"mvc/ui/ui-popover",
|
||||
"mvc/ui/ui-modal",
|
||||
"mvc/ui",
|
||||
"utils/uploadbox"],
|
||||
|
||||
function( Utils,
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
define(["mvc/dataset/states","mvc/history/hdca-li","jq-plugins/ui/fa-icon-button","utils/localization"],function(a,f,c,b){var d=f.HDCAListItemView;var e=d.extend({_renderPrimaryActions:function(){this.log(this+"._renderPrimaryActions");return d.prototype._renderPrimaryActions.call(this).concat([this._renderDeleteButton()])},_renderDeleteButton:function(){var h=this,g=this.model.get("deleted");return c({title:g?b("Dataset collection is already deleted"):b("Delete"),classes:"delete-btn",faIcon:"fa-times",disabled:g,onclick:function(){h.$el.find(".icon-btn.delete-btn").trigger("mouseout");h.model["delete"]()}})},toString:function(){var g=(this.model)?(this.model+""):("(no model)");return"HDCAListItemEdit("+g+")"}});return{HDCAListItemEdit:e}});
|
||||
define(["mvc/dataset/states","mvc/history/hdca-li","ui/fa-icon-button","utils/localization"],function(a,f,c,b){var d=f.HDCAListItemView;var e=d.extend({_renderPrimaryActions:function(){this.log(this+"._renderPrimaryActions");return d.prototype._renderPrimaryActions.call(this).concat([this._renderDeleteButton()])},_renderDeleteButton:function(){var h=this,g=this.model.get("deleted");return c({title:g?b("Dataset collection is already deleted"):b("Delete"),classes:"delete-btn",faIcon:"fa-times",disabled:g,onclick:function(){h.$el.find(".icon-btn.delete-btn").trigger("mouseout");h.model["delete"]()}})},toString:function(){var g=(this.model)?(this.model+""):("(no model)");return"HDCAListItemEdit("+g+")"}});return{HDCAListItemEdit:e}});
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -20,8 +20,7 @@ require(
|
||||
'libs/jquery/select2',
|
||||
'libs/farbtastic',
|
||||
'libs/jquery/jquery.form',
|
||||
'libs/jquery/jquery.rating',
|
||||
'mvc/ui'
|
||||
'libs/jquery/jquery.rating'
|
||||
], function(mod_utils, mod_icon_btn)
|
||||
{
|
||||
// load css
|
||||
|
||||
@@ -53,7 +53,6 @@
|
||||
"libs/backbone/backbone",
|
||||
"libs/handlebars.runtime",
|
||||
"galaxy.base",
|
||||
"mvc/ui",
|
||||
'libs/require'
|
||||
)}
|
||||
|
||||
|
||||
@@ -59,8 +59,7 @@
|
||||
'libs/backbone/backbone',
|
||||
'libs/handlebars.runtime',
|
||||
'galaxy.base',
|
||||
'libs/require',
|
||||
"mvc/ui"
|
||||
'libs/require'
|
||||
)}
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
@@ -39,8 +39,7 @@
|
||||
'libs/d3',
|
||||
'galaxy.base',
|
||||
'galaxy.panels',
|
||||
'libs/handlebars.runtime',
|
||||
"mvc/ui"
|
||||
'libs/handlebars.runtime'
|
||||
)}
|
||||
|
||||
## send errors to Sntry server if configured
|
||||
|
||||
@@ -182,7 +182,7 @@ a.btn {
|
||||
'mvc/user/user-model',
|
||||
panelToUse.location,
|
||||
'utils/localization',
|
||||
'jq-plugins/ui/mode-button'
|
||||
'ui/mode-button'
|
||||
], function( user, panelMod, _l ){
|
||||
$(function(){
|
||||
setUpBehaviors();
|
||||
|
||||
Reference in New Issue
Block a user