Closed Bug 924890 Opened 11 years ago Closed 11 years ago

[Contacts] Javascript error after landing bug 902873 (merge error)

Categories

(Firefox OS Graveyard :: Gaia::Contacts, defect, P1)

Product:
Firefox OS Graveyard
Component:
Gaia::Contacts
Platform:
ARM
Gonk (Firefox OS)
Type:
defect

Tracking

(blocking-b2g:koi+, b2g-v1.2 fixed)

Status:
RESOLVED FIXED
Milestone:
1.2 C3(Oct25)
Project Flags:
blocking-b2g koi+
Tracking Flags:
Tracking Status
b2g-v1.2 --- fixed

People

(Reporter: arcturus, Assigned: arcturus)

Details

(Keywords: perf, Whiteboard: [c= p= s= u=1.2])

Attachments

(1 file)

Pointer to PR 12756
359 bytes, text/html
bkelly
: review+
Details 
We recently landed the performance improvements in bug 902873.

After a rebase, the functionality is there but we can see the error:

JavaScript error: http://communications.gaiamobile.org:8080/contacts/js/views/list.js, line 1464: notSelecteIds is not defined

This has been caused by a rebase in order to land
Nominating for koi since has been caused by the merge of a koi+ code.
Assignee: nobody → francisco.jordano
blocking-b2g: --- → koi?
Whiteboard: [c= p=4 s= u=1.2]
Looks like a one character typo?  s/notSelecteIds/notSelectedIds/g ?
right, simple fix
Attached file Pointer to PR 12756 — 

        Attachment #814932 -
        Flags: review?(bkelly)

        Attachment #814932 -
        Flags: review?(bkelly) → review+

    
  
Status: NEW → ASSIGNED
blocking-b2g: koi? → koi+
Keywords: perf
OS: Mac OS X → Gonk (Firefox OS)
Priority: -- → P1
Hardware: x86 → ARM

    
    

    
  
Landed:

https://github.com/mozilla-b2g/gaia/commit/f4514d1de0d008eda71f9784e78798bf8ad09110
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Target Milestone: --- → 1.2 C2(Oct11)

    
  
Whiteboard: [c= p=4 s= u=1.2] → [c= p=4 s=2013.10.18 u=1.2]
Target Milestone: 1.2 C2(Oct11) → 1.2 C3(Oct25)

    
  
Whiteboard: [c= p=4 s=2013.10.18 u=1.2] → [c= p=4 s= u=1.2]

    
    

    
  
I was not able to uplift this bug to v1.2.  If this bug has dependencies which are not marked in this bug, please comment on this bug.  If this bug depends on patches that aren't approved for v1.2, we need to re-evaluate the approval.  Otherwise, if this is just a merge conflict, you might be able to resolve it with:

  git checkout v1.2
  git cherry-pick -x -m1 f4514d1de0d008eda71f9784e78798bf8ad09110
  <RESOLVE MERGE CONFLICTS>
  git commit
Flags: needinfo?(francisco.jordano)

    
  
Whiteboard: [c= p=4 s= u=1.2] → [c= p= s= u=1.2]

          You need to log in
          before you can comment on or make changes to this bug.
        






  

    
  







  

    

      
Attachment

      

      
      
      
      
    

    

      

        

          

            
General

            

              Creator: 



            

            
Created: 

            
Updated: 

            
Size: