Commit graph

3774 commits

Author SHA1 Message Date
LaShonda Hopper
83749b16c7 [Case 4315] ESLint Pass 5 resolves hex already defined issue (details below).
* var hex was declared both the hexToRGB and hexToHsb functions.
    * hexToRGB was updated to have a more explicit var name
    * hexToRGB & hexToHSB also had the function param name updated to clarify the expected
      object type.  Also error statements and early returns were added should an unsupported
      object type be received.

* Issue Count is now 28

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
2018-02-09 17:35:03 -05:00
LaShonda Hopper
ef1fd19a98 [Case 4315] ESLint Pass 4 for colpick.js (details below).
Resolved payeX vs pageX issues.
Resolved stopList & huebar undefined issues.

Issue Count reduced from 47 to 29.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
2018-02-09 17:14:34 -05:00
LaShonda Hopper
0a1e05326e [Case 4315] ESLint Pass 3, adds global declarations (details below).
This resolves 23 error <x> is not defined no-undef errors related to global objects.
Issue Count reduced from 70 to 47.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
2018-02-09 16:49:44 -05:00
LaShonda Hopper
691aafcf29 [Case 4315] ESLint Pass 2 for colpick.js (details below).
Resolves all error Line <x> exceeds the maximum line length of 128  max-len issues.
Issue Count reduced from 85 to 70.

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
2018-02-09 16:42:43 -05:00
LaShonda Hopper
35bf8f1d01 [Case 4315] ESLint Pass; Simple errors addressed (details below).
Initial ESLint Pass on colpick.js.
Issue Count reduced from 185 to 100 via:
    eslint -c .eslintrc.js scripts/system/html/js/colpick.js --fix

Changes Committed:
    modified:   scripts/system/html/js/colpick.js
2018-02-09 16:24:54 -05:00
LaShonda Hopper
6c5961820c [Case 4315] Fixes Color Picker preview restore functionality (details below).
* The original color preview is now visually retained when the user
  changes the color via the picker when using the Non-Submit configuration (No OK button).
* Clicking the initial old color preview section restores the original/initial color of
  the object.

Tested Desktop & HMD Modes.

Changes Committed:
    modified:   scripts/system/html/css/colpick.css
    modified:   scripts/system/html/js/colpick.js
2018-02-09 14:56:52 -05:00
LaShonda Hopper
2fc954909b [Case 4315] Fixes black color preview for color pickers (details below).
The original/starting color preview in the picker was black as opposed to
reflecting the entity's color upon clicking the color picker.

Known Issue(s)/TODO(s):

* Color preview restore color functionality isn't working.
    * Clicking the initial color preview doesn't restore the color.
    * The original color preview isn't being visually retained when the user
      changes the color via the picker.

Tested HMD & Desktop Modes.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2018-02-09 14:40:40 -05:00
John Conklin II
40851b097f
Merge pull request #12324 from ElderOrb/FB11844
Fix the issue with not re-enabling preview after it was auto-disabled by wallet/marketplace
2018-02-07 14:31:20 -08:00
Alexander Ivash
151f20a92f define onWalletScreen in this marketplaces.js scope 2018-02-06 21:25:41 +03:00
Dante Ruiz
601914180d fixing teleport module for sit script 2018-02-05 11:52:35 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle
Commerce: Send Money Nearby particle effect!
2018-02-02 14:17:48 -08:00
Seth Alves
00b184124d
Merge pull request #12308 from vladest/fix_progress_animation
Image overlay uses bounds property
2018-02-02 12:53:20 -08:00
Zach Fox
2f3448ed1f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle 2018-02-02 10:59:49 -08:00
Alexander Ivash
46bace97cf FB11844 - Disable Preview enabled some time after unchecking the Display >Disable Preview option. 2018-02-02 19:08:50 +03:00
Melissa Brown
bf5b875382
Merge pull request #12241 from 1P-Cusack/FogBugz/Case_4315_okbutton
[Case 4315] Edit menu color picker OK button is hard to use in HMD
2018-02-01 16:52:07 -08:00
Zach Fox
89e52561e3 Silly bugfix 2018-02-01 11:56:54 -08:00
Zach Fox
268c12e47a Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle 2018-02-01 11:38:47 -08:00
John Conklin II
6eac91a3c7
Merge pull request #12304 from sethalves/fix-upside-down-equip
allow upside-down equip
2018-02-01 10:47:07 -08:00
John Conklin II
acde2511ba
Merge pull request #12305 from sethalves/fix-run-reload
fix left-over run button when scripts are reloaded
2018-02-01 10:46:44 -08:00
Zach Fox
bd26c9dfc0 More improvements 2018-02-01 09:36:41 -08:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729
Add location.domainID as a synonym for location.domainId
2018-01-31 13:50:48 -08:00
vladest
87ab8a5840 Image overlay uses bounds property 2018-01-31 21:46:05 +01:00
Zach Fox
90c2371f0c It's working! 2018-01-31 12:09:23 -08:00
Seth Alves
a596e07464 fix left-over run button when scripts are reloaded 2018-01-31 11:05:35 -08:00
Zach Fox
8a729e3cf0 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle 2018-01-31 10:54:32 -08:00
Seth Alves
c4f57877dd if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright 2018-01-31 10:06:20 -08:00
Zach Fox
05fe33e417 Initial work 2018-01-30 18:01:46 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
David Rowe
280264d7ed Add location.domainID as a synonym for location.domainId
And deprecate location.domainId.
2018-01-30 20:46:27 +13:00
Liv Erickson
3aa12eb7df pass in deletedIDs so can delete children depth > 1 2018-01-29 17:51:26 -08:00
Dante Ruiz
08511a2a2e fix new model path 2018-01-29 15:27:55 -08:00
Zach Fox
00555250a0 400 connections per page for Wallet and PAL 2018-01-29 12:07:07 -08:00
John Conklin II
d537146fd1
Merge pull request #12240 from luiscuenca/gotoFixForHMD
RC63 GoTo fix for HMD
2018-01-25 09:37:59 -08:00
John Conklin II
1529fea983 Revert "Display both lasers on tablet and Web surfaces"
(cherry picked from commit 455090d2b9)
2018-01-24 14:51:42 -08:00
luiscuenca
29dd24b05f Fix GoTo app in HMD mode 2018-01-23 15:50:32 -07:00
LaShonda Hopper
180be18178 [Case 4315] Fixes color picker issue in HMD mode (details below).
Previously when in HMD mode, using the color picker to select a color via the
gradient or hue areas would result in the page scrolling making it difficult to
select the color or hue desired.

This resolves the issue by turning off touch actions for the elements
of the color picker that should have it when using the color picker.

Tested in HMD & Desktop mode.

Changes Committed:
    modified:   scripts/system/html/css/colpick.css
2018-01-23 14:02:31 -05:00
LaShonda Hopper
4da7a1e65a [Case 4315] ESLint pass on entityProperties.js.
Re-ran after changes and issue count was 0.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2018-01-23 13:48:47 -05:00
LaShonda Hopper
72ed5f6d91 [Case 4315] Fixes OK button hard to use within HMD mode (details below).
* Shape Color picker dynamically updates entity color.
    * This removes the OK button which was hard to interact with in HMD mode.  The user no
      longer needs to click the OK button to submit changes to the color; rather the color
      of the entity updates as the user manipulates the color wheel and/or slider.

 Known Issue/TODO(s):

* Color Picker's Color Preview area has a bug where the original/starting color preview
is black as opposed to reflecting the entity's color upon clicking the color picker.
    * Color preview restore color functionality isn't working.  Clicking the initial
color preview doesn't restore the color.

* In HMD Mode: While interacting with the picker the user is able to control scrolling
  navigation for the edit menu.  For example, when moving up or down to change the hue
  the edit menu behind the picker will scroll up and down correlatively.
* In HMD Mode: When the picker is dismissed (user clicks outside the picker), the RGB
  fields for the color still receive input.

Tested in Desktop & HMD Modes.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2018-01-23 13:40:31 -05:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703
Revert "Display both lasers on tablet and Web surfaces"
2018-01-22 12:27:00 -08:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2
Commerce: Pixel-perfect "Send Money" UI
2018-01-22 09:39:23 -08:00
Seth Alves
45a00bebc0
Merge pull request #12217 from luiscuenca/sortOrderFix
Fix sortOrder param on tablet buttons
2018-01-21 10:40:25 -08:00
ZappoMan
f6062ebfcc new icon and button layout 2018-01-19 16:00:08 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces" 2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703
Display both lasers on tablet and Web surfaces
2018-01-19 15:15:44 -08:00
David Rowe
7898aa2c4b Code review 2018-01-20 10:32:42 +13:00
Stephen Birarda
018bcc623b
Merge pull request #12213 from birarda/feat/hide-error-decrypting-notification
suppress Interface notification for DS decryption error
2018-01-19 14:10:10 -07:00
David Rowe
94e6a68d41 Code review 2018-01-20 09:50:24 +13:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Ryan Downe Karpf
f1b18ccc00
Merge pull request #12184 from ctrlaltdavid/21700
Add Window browseChanged signal as replacement for openFileChanged
2018-01-19 10:45:27 -08:00
Ryan Downe Karpf
08b4c6eb40
Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow
reduce calls to isPointOnDesktopWindow in controllerModules
2018-01-19 10:44:57 -08:00