Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mf/20230314 import fixes #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Mf/20230314 import fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f2028f
Fix missing imports
mfontani Mar 14, 2023
f1b4953
aki: no need to import css.js
mfontani Mar 14, 2023
7023b28
XXX insert aki css in sproutcore css
mfontani Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions desktop/desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import './render_delegates/workspace.js';
SC.setSetting('allowsBackspaceToPreviousPage', false);

export { ScrollerView, OverlayScrollerView } from './views/scroller.js';
export { ListItemView } from './views/list_item.js';
export { ButtonView } from './views/button.js';
export { CheckboxView } from './views/checkbox.js';
export * from './system/constants.js';
Expand Down
2 changes: 1 addition & 1 deletion desktop/panes/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { bodyOverflowArbitrator, propertyFromRenderDelegate, REGULAR_CONTROL_SIZ
import { MenuItemView } from "../views/menu_item.js";
import { MenuScrollView } from "../views/menu_scroll.js";
import { PickerPane, PICKER_MENU } from "./picker.js";

import { SC } from '../../core/core.js';

/**
@class
Expand Down
2 changes: 1 addition & 1 deletion event/system/core_query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// License: Licensed under MIT license (see license.js)
// ==========================================================================

import jQuery from '../../node_modules/jquery/dist/jquery.slim.js';
import '../../node_modules/jquery/dist/jquery.slim.js';
import { SC } from '../../core/core.js';

// @ts-ignore
Expand Down
3 changes: 2 additions & 1 deletion sproutcore_css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// for bundlers
import './themes/aki/css.js';
import './view/css/css.js';
import './desktop/css/desktop.js';
import './desktop/css/desktop.js';
2 changes: 1 addition & 1 deletion themes/aki/theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { SC } from '../../core/core.js';
import { BaseTheme, Theme } from '../../view/view.js';
import './css.js';
// import './css.js';
import './resources/scroller/scroller.js';
/**
* @class
Expand Down